--- parser3/src/targets/cgi/parser3.C	2001/04/09 08:55:40	1.58
+++ parser3/src/targets/cgi/parser3.C	2001/04/23 13:29:53	1.71
@@ -5,7 +5,7 @@
 
 	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: parser3.C,v 1.58 2001/04/09 08:55:40 paf Exp $
+	$Id: parser3.C,v 1.71 2001/04/23 13:29:53 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -14,18 +14,12 @@
 #	include <windows.h>
 #endif
 
-#include <io.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <time.h>
-
 #include "pa_sapi.h"
 #include "pa_common.h"
 #include "pa_globals.h"
 #include "pa_request.h"
 #include "pa_socks.h"
-#include "pa_exec.h"
+#include "pa_version.h"
 
 /// IIS refuses to read bigger chunks
 const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M 
@@ -55,42 +49,6 @@ static LONG WINAPI TopLevelExceptionFilt
 #endif
 
 // 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;
-	do {
-		int chunk_size=read(fileno(stdin), 
-			buf+read_size, min(READ_POST_CHUNK_SIZE, max_bytes-read_size));
-		if(chunk_size<0)
-			break;
-		read_size+=chunk_size;
-	} while(read_size<max_bytes);
-
-	return read_size;
-}
-
-void SAPI::add_header_attribute(Pool& pool, const char *key, const char *value) {
-	if(cgi)
-		printf("%s: %s\n", key, value);
-}
-
-/// @todo intelligent cache-control
-void SAPI::send_header(Pool& pool) {
-	if(cgi) {
-		puts("expires: Fri, 23 Mar 2001 09:32:23 GMT");
-
-		// header | body  delimiter
-		puts("");
-	}
-}
-
-void SAPI::send_body(Pool& pool, const void *buf, size_t size) {
-	stdout_write(buf, size);
-}
-
 // appends to parser3.log located beside my binary
 void SAPI::log(Pool& pool, const char *fmt, ...) {
 	bool opened;
@@ -124,11 +82,40 @@ void SAPI::log(Pool& pool, const char *f
 		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);
+const char *SAPI::get_env(Pool& pool, const char *name) {
+ 	return getenv(name);
+}
+
+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));
+		if(chunk_size<0)
+			break;
+		read_size+=chunk_size;
+	} while(read_size<max_bytes);
+
+	return read_size;
+}
+
+void SAPI::add_header_attribute(Pool& pool, const char *key, const char *value) {
+	if(cgi)
+		printf("%s: %s\n", key, value);
+}
+
+/// @todo intelligent cache-control
+void SAPI::send_header(Pool& pool) {
+	if(cgi) {
+		puts("expires: Fri, 23 Mar 2001 09:32:23 GMT");
+
+		// header | body  delimiter
+		puts("");
+	}
+}
+
+void SAPI::send_body(Pool& pool, const void *buf, size_t size) {
+	stdout_write(buf, size);
 }
 
 /**
@@ -159,8 +146,14 @@ int main(int argc, char *argv[]) {
 	
 	if(!cgi) {
 		if(argc<2) {
-			printf("Usage: %s <file>\n", argv0?argv0:"parser3");
-			exit(1);
+			printf(
+				"Parser/%s Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)\n"
+				"Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)\n"
+				"\n"
+				"Usage: %s <file>\n",
+				PARSER_VERSION, 
+				argv0?argv0:"parser3");
+			return 1;
 		}
 	}
 
@@ -175,10 +168,9 @@ int main(int argc, char *argv[]) {
 		// must be first in PTRY{}PCATCH
 #ifdef WIN32
 		SetUnhandledExceptionFilter(&TopLevelExceptionFilter);
-		//TODO: initSocks();
 #endif
 
-		// 
+		// init socks
 		init_socks(pool);
 
 		// init global variables
@@ -187,7 +179,7 @@ int main(int argc, char *argv[]) {
 		if(!filespec_to_process)
 			PTHROW(0, 0,
 				0,
-				"no file to process");
+				"Parser/%s", PARSER_VERSION);
 
 		// Request info
 		Request::Info request_info;
@@ -208,14 +200,16 @@ int main(int argc, char *argv[]) {
 		} else {
 			static char buf[MAX_STRING];
 			strncpy(buf, filespec_to_process, MAX_STRING);
-			rsplit(buf, '/');  rsplit(buf, '\\');// strip filename
-			request_info.document_root=buf;
+			if(rsplit(buf, '/') || rsplit(buf, '\\')) // strip filename
+				request_info.document_root=buf;
+			else
+				request_info.document_root="";
 		}
 		request_info.path_translated=filespec_to_process;
 		request_info.method=request_method;
 		const char *query_string=SAPI::get_env(pool, "QUERY_STRING");
 		request_info.query_string=query_string;
-		if(cgi) 
+		if(cgi) {
 			if(const char *env_request_uri=SAPI::get_env(pool, "REQUEST_URI"))
 				request_info.uri=env_request_uri;
 			else if(const char *path_info=SAPI::get_env(pool, "PATH_INFO"))
@@ -233,7 +227,14 @@ int main(int argc, char *argv[]) {
 				PTHROW(0, 0,
 					0,
 					"CGI: no PATH_INFO defined(in reinventing REQUEST_URI)");
-		else
+
+			const char *script_name=SAPI::get_env(pool, "SCRIPT_NAME");
+			if(script_name &&
+				strncmp(request_info.uri,script_name, strlen(script_name))==0)
+				PTHROW(0, 0,
+					0,
+					"CGI: illegal call");
+		} else
 			request_info.uri=0;
 
 		request_info.content_type=SAPI::get_env(pool, "CONTENT_TYPE");
@@ -245,7 +246,7 @@ int main(int argc, char *argv[]) {
 		// prepare to process request
 		Request request(pool,
 			request_info,
-			1||cgi ? String::UL_HTML_TYPO : String::UL_CLEAN
+			cgi ? String::UL_HTML_TYPO : String::UL_AS_IS
 			);
 		
 		// some root-controlled location
@@ -255,7 +256,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=SAPI::get_env(pool, "HOME");
+		const char *root_auto_path=SAPI::get_env(pool, "HOME");
 #endif
 		
 		// beside by binary
@@ -297,7 +298,7 @@ int main(int argc, char *argv[]) {
 		// prepare header
 		SAPI::add_header_attribute(pool, "content-type", "text/plain");
 		char content_length_cstr[MAX_NUMBER];
-		snprintf(content_length_cstr, MAX_NUMBER, "%lu", content_length);
+		snprintf(content_length_cstr, MAX_NUMBER, "%u", content_length);
 		SAPI::add_header_attribute(pool, "content-length", content_length_cstr);
 
 		// send header