--- parser3/src/targets/cgi/parser3.C	2001/03/23 14:03:28	1.41
+++ parser3/src/targets/cgi/parser3.C	2001/03/24 09:24:45	1.43
@@ -1,11 +1,11 @@
 /** @file
 	Parser: scripting and CGI main.
 
-	Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright(c) 2001 ArtLebedev Group(http://www.artlebedev.com)
 
-	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+	Author: Alexander Petrosyan <paf@design.ru>(http://design.ru/paf)
 
-	$Id: parser3.C,v 1.41 2001/03/23 14:03:28 paf Exp $
+	$Id: parser3.C,v 1.43 2001/03/24 09:24:45 paf Exp $
 */
 
 #include "pa_config_includes.h"
@@ -24,12 +24,15 @@
 #include "pa_globals.h"
 #include "pa_request.h"
 
-Pool pool; // global pool [dont describe to doxygen: it confuses it with param names]
+/// IIS refuses to read bigger chunks
+const size_t READ_POST_CHUNK_SIZE=0x400*0x400; // 1M 
+
+Pool pool(0); // global pool [dont describe to doxygen: it confuses it with param names]
 bool cgi; ///< we were started as CGI?
 
 #ifdef WIN32
 /// global system errors into parser exceptions converter
-static LONG WINAPI TopLevelExceptionFilter (struct _EXCEPTION_POINTERS *ExceptionInfo) {
+static LONG WINAPI TopLevelExceptionFilter(struct _EXCEPTION_POINTERS *ExceptionInfo) {
 	char buf[MAX_STRING];
 	if(ExceptionInfo && ExceptionInfo->ExceptionRecord) {
 		struct _EXCEPTION_RECORD *er=ExceptionInfo->ExceptionRecord;
@@ -47,15 +50,6 @@ static LONG WINAPI TopLevelExceptionFilt
 }
 #endif
 
-#ifdef WIN32
-static void fix_slashes(char *s) {
-	if(s)
-		for(; *s; s++)
-			if(*s=='\\')
-				*s='/';
-}
-#endif
-
 //@{
 /// SAPI funcs decl
 const char *SAPI::get_env(Pool& pool, const char *name) {
@@ -66,7 +60,7 @@ uint SAPI::read_post(Pool& pool, char *b
 	uint read_size=0;
 	do {
 		int chunk_size=read(fileno(stdin), 
-			buf+read_size, min(0x400*0x400, max_bytes-read_size));
+			buf+read_size, min(READ_POST_CHUNK_SIZE, max_bytes-read_size));
 		if(chunk_size<0)
 			break;
 		read_size+=chunk_size;
@@ -129,7 +123,7 @@ int main(int argc, char *argv[]) {
 
 	char *filespec_to_process=cgi?getenv("PATH_TRANSLATED"):argv[1];
 #ifdef WIN32
-	fix_slashes(filespec_to_process);
+	back_slashes_to_slashes(filespec_to_process);
 #endif
 
 	const char *request_method=getenv("REQUEST_METHOD");
@@ -164,7 +158,7 @@ int main(int argc, char *argv[]) {
 			} else
 				PTHROW(0, 0,
 					0,
-					"CGI: no PATH_INFO defined (in reinventing DOCUMENT_ROOT)");
+					"CGI: no PATH_INFO defined(in reinventing DOCUMENT_ROOT)");
 		} else {
 			static char buf[MAX_STRING];
 			strncpy(buf, filespec_to_process, MAX_STRING);
@@ -175,23 +169,26 @@ int main(int argc, char *argv[]) {
 		request_info.method=request_method;
 		const char *query_string=getenv("QUERY_STRING");
 		request_info.query_string=query_string;
-		if(const char *env_request_uri=getenv("REQUEST_URI"))
-			request_info.uri=env_request_uri;
-		else if (const char *path_info=getenv("PATH_INFO")) {
-			if(query_string) {
-				char *reconstructed_uri=(char *)malloc(
-					strlen(path_info)+1/*'?'*/+
-					strlen(query_string)+1/*0*/);
-				strcpy(reconstructed_uri, path_info);
-				strcat(reconstructed_uri, "?");
-				strcat(reconstructed_uri, query_string);
-				request_info.uri=reconstructed_uri;
-			} else
-				request_info.uri=path_info;
-		} else
-			PTHROW(0, 0,
-				0,
-				"CGI: no PATH_INFO defined (in reinventing REQUEST_URI)");
+		if(cgi) 
+			if(const char *env_request_uri=getenv("REQUEST_URI"))
+				request_info.uri=env_request_uri;
+			else if(const char *path_info=getenv("PATH_INFO"))
+				if(query_string) {
+					char *reconstructed_uri=(char *)malloc(
+						strlen(path_info)+1/*'?'*/+
+						strlen(query_string)+1/*0*/);
+					strcpy(reconstructed_uri, path_info);
+					strcat(reconstructed_uri, "?");
+					strcat(reconstructed_uri, query_string);
+					request_info.uri=reconstructed_uri;
+				} else
+					request_info.uri=path_info;
+			else
+				PTHROW(0, 0,
+					0,
+					"CGI: no PATH_INFO defined(in reinventing REQUEST_URI)");
+		else
+			request_info.uri=0;
 
 		request_info.content_type=getenv("CONTENT_TYPE");
 		const char *content_length=getenv("CONTENT_LENGTH");
@@ -232,6 +229,11 @@ int main(int argc, char *argv[]) {
 		// successful finish
 		return 0;
 	} PCATCH(e) { // global problem 
+		// must be first in PCATCH{}
+#ifdef WIN32
+		SetUnhandledExceptionFilter(0);
+#endif
+
 		const char *body=e.comment();
 		int content_length=strlen(body);