--- parser3/src/targets/cgi/parser3.C	2001/03/24 14:56:09	1.45
+++ parser3/src/targets/cgi/parser3.C	2001/04/09 09:48:26	1.59
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: parser3.C,v 1.45 2001/03/24 14:56:09 paf Exp $
+	$Id: parser3.C,v 1.59 2001/04/09 09:48:26 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -24,6 +24,8 @@
 #include "pa_common.h"
 #include "pa_globals.h"
 #include "pa_request.h"
+#include "pa_socks.h"
+#include "pa_exec.h"
 
 /// IIS refuses to read bigger chunks
 const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M 
@@ -38,7 +40,7 @@ static LONG WINAPI TopLevelExceptionFilt
 	char buf[MAX_STRING];
 	if(ExceptionInfo && ExceptionInfo->ExceptionRecord) {
 		struct _EXCEPTION_RECORD *er=ExceptionInfo->ExceptionRecord;
-		snprintf(buf, MAX_STRING, "Exception %#X at %p", 
+		snprintf(buf, MAX_STRING, "Exception 0x%X at %p", 
 			er->ExceptionCode, 
 			er->ExceptionAddress);
 	} else 
@@ -52,14 +54,13 @@ static LONG WINAPI TopLevelExceptionFilt
 }
 #endif
 
-//@{
-/// SAPI funcs decl
+// SAPI
 const char *SAPI::get_env(Pool& pool, const char *name) {
  	return getenv(name);
 }
 
-uint SAPI::read_post(Pool& pool, char *buf, uint max_bytes) {
-	uint read_size=0;
+size_t SAPI::read_post(Pool& pool, char *buf, size_t max_bytes) {
+	size_t read_size=0;
 	do {
 		int chunk_size=read(fileno(stdin), 
 			buf+read_size, min(READ_POST_CHUNK_SIZE, max_bytes-read_size));
@@ -86,11 +87,11 @@ void SAPI::send_header(Pool& pool) {
 	}
 }
 
-void SAPI::send_body(Pool& pool, const char *buf, size_t size) {
+void SAPI::send_body(Pool& pool, const void *buf, size_t size) {
 	stdout_write(buf, size);
 }
 
-/// appends to parser3.log located beside my binary
+// appends to parser3.log located beside my binary
 void SAPI::log(Pool& pool, const char *fmt, ...) {
 	bool opened;
 	FILE *f=0;
@@ -122,7 +123,13 @@ void SAPI::log(Pool& pool, const char *f
 	if(opened)
 		fclose(f);
 }
-//@}
+
+int SAPI::execute(const String& file_spec, 
+	const Hash *env,
+	const Array *argv,
+	const String& in, String& out, String& err) {
+	return pa_exec(file_spec, env, argv, in,  out, err);
+}
 
 /**
 	main workhorse
@@ -171,6 +178,9 @@ int main(int argc, char *argv[]) {
 		//TODO: initSocks();
 #endif
 
+		// 
+		init_socks(pool);
+
 		// init global variables
 		pa_globals_init(pool);
 
@@ -182,9 +192,9 @@ int main(int argc, char *argv[]) {
 		// Request info
 		Request::Info request_info;
 		if(cgi) {
-			if(const char *env_document_root=getenv("DOCUMENT_ROOT"))
+			if(const char *env_document_root=SAPI::get_env(pool, "DOCUMENT_ROOT"))
 				request_info.document_root=env_document_root;
-			else if(const char *path_info=getenv("PATH_INFO")) {
+			else if(const char *path_info=SAPI::get_env(pool, "PATH_INFO")) {
 				// IIS
 				size_t len=strlen(filespec_to_process)-strlen(path_info);
 				char *buf=(char *)pool.malloc(len+1);
@@ -203,12 +213,12 @@ int main(int argc, char *argv[]) {
 		}
 		request_info.path_translated=filespec_to_process;
 		request_info.method=request_method;
-		const char *query_string=getenv("QUERY_STRING");
+		const char *query_string=SAPI::get_env(pool, "QUERY_STRING");
 		request_info.query_string=query_string;
 		if(cgi) 
-			if(const char *env_request_uri=getenv("REQUEST_URI"))
+			if(const char *env_request_uri=SAPI::get_env(pool, "REQUEST_URI"))
 				request_info.uri=env_request_uri;
-			else if(const char *path_info=getenv("PATH_INFO"))
+			else if(const char *path_info=SAPI::get_env(pool, "PATH_INFO"))
 				if(query_string) {
 					char *reconstructed_uri=(char *)malloc(
 						strlen(path_info)+1/*'?'*/+
@@ -226,15 +236,16 @@ int main(int argc, char *argv[]) {
 		else
 			request_info.uri=0;
 
-		request_info.content_type=getenv("CONTENT_TYPE");
-		const char *content_length=getenv("CONTENT_LENGTH");
+		request_info.content_type=SAPI::get_env(pool, "CONTENT_TYPE");
+		const char *content_length=SAPI::get_env(pool, "CONTENT_LENGTH");
 		request_info.content_length=(content_length?atoi(content_length):0);
-		request_info.cookie=getenv("HTTP_COOKIE");
+		request_info.cookie=SAPI::get_env(pool, "HTTP_COOKIE");
+		request_info.user_agent=SAPI::get_env(pool, "HTTP_USER_AGENT");
 
 		// prepare to process request
 		Request request(pool,
 			request_info,
-			cgi ? String::UL_HTML_TYPO : String::UL_NO
+			1||cgi ? String::UL_HTML_TYPO : String::UL_CLEAN
 			);
 		
 		// some root-controlled location
@@ -244,7 +255,7 @@ int main(int argc, char *argv[]) {
 		GetWindowsDirectory(root_auto_path, MAX_STRING);
 #else
 		// ~nobody  todo: figure out a better place
-		char *root_auto_path=getenv("HOME");
+		char *root_auto_path=SAPI::get_env(pool, "HOME");
 #endif
 		
 		// beside by binary
@@ -258,6 +269,9 @@ int main(int argc, char *argv[]) {
 			site_auto_path, false,
 			header_only);
 
+		//
+		done_socks();
+
 		// must be last in PTRY{}PCATCH
 #ifdef WIN32
 		SetUnhandledExceptionFilter(0);