--- parser3/src/targets/cgi/parser3.C	2003/11/07 13:59:22	1.221
+++ parser3/src/targets/cgi/parser3.C	2004/06/18 09:17:11	1.228
@@ -1,11 +1,11 @@
 /** @file
 	Parser: scripting and CGI main.
 
-	Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char* IDENT_PARSER3_C="$Date: 2003/11/07 13:59:22 $";
+static const char * const IDENT_PARSER3_C="$Date: 2004/06/18 09:17:11 $";
 
 #include "pa_config_includes.h"
 
@@ -33,6 +33,7 @@ static const char* IDENT_PARSER3_C="$Dat
 
 #define REDIRECT_PREFIX "REDIRECT_"
 #define PARSER_CONFIG_ENV_NAME "CGI_PARSER_CONFIG"
+#define PARSER_LOG_ENV_NAME "CGI_PARSER_LOG"
 
 /// IIS refuses to read bigger chunks
 const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M 
@@ -57,7 +58,15 @@ static void log(const char* fmt, va_list
 	bool opened=false;
 	FILE *f=0;
 
-	if(config_filespec_cstr) {
+	const char* log_by_env=getenv(PARSER_LOG_ENV_NAME);
+	if(!log_by_env)
+		log_by_env=getenv(REDIRECT_PREFIX PARSER_LOG_ENV_NAME);
+	if(log_by_env) {
+		f=fopen(log_by_env, "at");
+		opened=f!=0;
+	}
+
+	if(!opened && config_filespec_cstr) {
 		char beside_config_path[MAX_STRING];
 		strncpy(beside_config_path, config_filespec_cstr, MAX_STRING-1);  beside_config_path[MAX_STRING-1]=0;
 		if(!(
@@ -265,6 +274,49 @@ static void SIGPIPE_handler(int /*sig*/)
 }
 #endif
 
+#ifdef WIN32
+const char* maybe_reconstruct_IIS_status_in_qs(const char* original) 
+{
+	// 404;http://servername/page[?param=value...]
+	// ';' should be urlencoded by HTTP standard, so we shouldn't get it from browser 
+	// and can consider that as an indication that this is IIS way to report errors
+
+	if(original 
+		&& isdigit(original[0])
+		&& isdigit(original[1])
+		&& isdigit(original[2])
+		&& original[3]==';') 
+	{
+		size_t original_len=strlen(original);
+        char* reconstructed=new(PointerFreeGC) char[original_len
+			+12/*IIS-STATUS=&*/
+			+14/*IIS-DOCUMENT=&*/
+			+1];
+		char* cur=reconstructed;
+		memcpy(cur, "IIS-STATUS=", 11);	 cur+=11;
+		memcpy(cur, original, 3); cur+=3;
+		*cur++='&';
+
+		const char* qmark_at=strchr(original, '?');
+		memcpy(cur, "IIS-DOCUMENT=", 13);  cur+=13;
+		{
+			size_t value_len=(qmark_at? qmark_at-original: original_len)-4;
+			memcpy(cur, original+4, value_len);  cur+=value_len;
+		}
+
+		if(qmark_at) {
+			*cur++='&';
+			strcpy(cur, qmark_at+1/*skip ? itself*/);
+		} else
+			*cur=0;
+
+		return reconstructed;
+	}
+	
+	return original;
+}
+#endif
+
 /**
 main workhorse
 
@@ -276,7 +328,7 @@ main workhorse
 static void real_parser_handler(const char* filespec_to_process,
 				const char* request_method, bool header_only) {
 	// init socks
-	pa_init_socks();
+	pa_socks_init();
 	
 	// init global variables
 	pa_globals_init();
@@ -305,7 +357,11 @@ static void real_parser_handler(const ch
 	}
 	request_info.path_translated=filespec_to_process;
 	request_info.method=request_method ? request_method : "GET";
-	const char* query_string=getenv("QUERY_STRING");
+	const char* query_string=
+#ifdef WIN32
+		maybe_reconstruct_IIS_status_in_qs
+#endif
+		(getenv("QUERY_STRING"));
 	request_info.query_string=query_string;
 	if(cgi) {
 		// few absolute obligatory
@@ -423,8 +479,11 @@ static void real_parser_handler(const ch
 	// no request [prevent signal handlers from accessing invalid memory]
 	::request=0;
 	
+	// finalize global variables
+	pa_globals_done();
+
 	//
-	pa_done_socks();
+	pa_socks_done();
 }
 
 #if _MSC_VER && !defined(_DEBUG)
@@ -491,7 +550,7 @@ static void call_real_parser_handler__do
 
 static void usage(const char* program) {
 	printf(
-		"Parser/%s Copyright(c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com)\n"
+		"Parser/%s Copyright(c) 2001-2004 ArtLebedev Group (http://www.artlebedev.com)\n"
 		"Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)\n"
 		"\n"
 		"Usage: %s [options] file\n"
@@ -507,6 +566,7 @@ static void usage(const char* program) {
 }
 
 int main(int argc, char *argv[]) {
+	//_asm int 3;
 	GC_java_finalization=0;
 
 #ifndef PA_DEBUG_DISABLE_GC