--- parser3/src/include/pa_sapi.h	2001/03/24 14:30:57	1.2
+++ parser3/src/include/pa_sapi.h	2020/10/14 00:07:42	1.35
@@ -1,33 +1,81 @@
 /** @file
 	Parser: web server api interface object decl.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
-
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
-
-	$Id: pa_sapi.h,v 1.2 2001/03/24 14:30:57 paf Exp $
+	Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)
+	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
 #ifndef PA_SAPI_H
 #define PA_SAPI_H
 
-#include "pa_pool.h"
-#include "pa_types.h"
+#define IDENT_PA_SAPI_H "$Id: pa_sapi.h,v 1.35 2020/10/14 00:07:42 moko Exp $"
+
+// includes
+
+#include "pa_common.h"
+#include "pa_array.h"
+#include "pa_exception.h"
 
-/// target web-server api
+// forwards
+class SAPI_Info;
+
+/// target web-Server API
 struct SAPI {
-	/// get env
-	static const char *get_env(Pool& pool, const char *name);
+	/// log error message
+	static void log(SAPI_Info& info, const char* fmt, ...);
+	/// log error message & exit
+	static void die(const char* fmt, ...);
 	/// read POST request bytes
-	static uint read_post(Pool& pool, char *buf, uint max_bytes);
-	/// add response header attribute
-	static void add_header_attribute(Pool& pool, const char *key, const char *value);
-	/// add response header attribute
-	static void send_header(Pool& pool);
+	static size_t read_post(SAPI_Info& info, char *buf, size_t max_bytes);
+	/// add response header attribute [but do not send it to client]
+	static void add_header_attribute(SAPI_Info& info, const char* dont_store_key, const char* dont_store_value);
+	/// send collected header attributes to client
+	static void send_header(SAPI_Info& info);
 	/// output body bytes
-	static void send_body(Pool& pool, const char *buf, size_t size);
-	/// log error message
-	static void log(Pool& pool, const char *fmt, ...);
+	static size_t send_body(SAPI_Info& info, const void *buf, size_t size);
+
+	static void send_error(SAPI_Info& info, const char *exception_cstr, const char *status = "500"){
+		// capitalized headers passed for preventing malloc during capitalization
+		add_header_attribute(info, HTTP_STATUS_CAPITALIZED, status);
+		add_header_attribute(info, HTTP_CONTENT_TYPE_CAPITALIZED, "text/plain");
+		send_header(info);
+		send_body(info, exception_cstr, strlen(exception_cstr));
+	}
+
+	class Env {
+	public:
+		/// entire environment
+		static const char* const* get(SAPI_Info& ainfo);
+		/// single environment string
+		static char* get(SAPI_Info& ainfo, const char* name);
+
+		class Iterator {
+		private:
+			const char* const* pairs;
+			const char* pair;
+			const char* eq_at;
+		public:
+			Iterator(SAPI_Info& asapi_info) : pair(NULL), eq_at(NULL){
+				if(pairs=SAPI::Env::get(asapi_info))
+					next();
+			}
+			operator bool () {
+				return pair!=0;
+			}
+			void next() {
+				while(pair=*pairs++)
+					if(eq_at=strchr(pair, '=')) // valid pair (key=value)
+						if(eq_at[1]) // value is not empty
+							break;
+			}
+			char* key(){
+				return pa_strdup(pair, eq_at-pair);
+			}
+			char* value(){
+				return pa_strdup(eq_at+1);
+			}
+		};
+	};
 };
 
 #endif