--- parser3/src/targets/isapi/parser3isapi.C	2004/07/26 10:44:21	1.91
+++ parser3/src/targets/isapi/parser3isapi.C	2007/11/27 09:58:05	1.99
@@ -1,11 +1,11 @@
 /** @file
 	Parser: IIS extension.
 
-	Copyright (c) 2000,2001-2004 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2000,2001-2005 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_PARSER3ISAPI_C="$Date: 2004/07/26 10:44:21 $";
+static const char * const IDENT_PARSER3ISAPI_C="$Date: 2007/11/27 09:58:05 $";
 
 #ifndef _MSC_VER
 #	error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)]
@@ -19,11 +19,19 @@ static const char * const IDENT_PARSER3I
 #include "pa_version.h"
 #include "pa_socks.h"
 
+#define  WINVER  0x0400
 #include <windows.h>
 #include <process.h>
 
 #include <httpext.h>
 
+// defines
+
+#if _MSC_VER && !defined(_DEBUG)
+#	define PA_SUPPRESS_SYSTEM_EXCEPTION
+#endif
+
+
 #define MAX_STATUS_LENGTH sizeof("xxxx LONGEST STATUS DESCRIPTION")
 
 // consts
@@ -69,12 +77,12 @@ public:
 void SAPI::log(SAPI_Info& SAPI_info, const char* fmt, ...) {
 	va_list args;
 	va_start(args,fmt);
-	char buf[MAX_STRING];
+	char buf[MAX_LOG_STRING];
 	const char* prefix="PARSER_ERROR:";
 	strcpy(buf, prefix);
 	char *start=buf+strlen(prefix);
-	DWORD size=vsnprintf(start, MAX_STRING-strlen(prefix), fmt, args);
-	remove_crlf(start, start+size);
+	DWORD size=vsnprintf(start, MAX_LOG_STRING-strlen(prefix), fmt, args);
+	size=remove_crlf(start, start+size);
 
 	SAPI_info.lpECB->ServerSupportFunction(SAPI_info.lpECB->ConnID, 
 		HSE_APPEND_LOG_PARAMETER, buf, &size, 0);
@@ -148,7 +156,7 @@ const char* const *SAPI::environment(SAP
 	char* all_http_vars=SAPI::get_env(info, "ALL_HTTP");
 	const int http_var_count=grep_char(all_http_vars, '\n')+1/*\n for theoretical(never saw) this \0*/;
 
-	const char* *result=new const char*[IIS51var_count+http_var_count+1/*0*/];
+	const char* *result=new(PointerFreeGC) const char*[IIS51var_count+http_var_count+1/*0*/];
 	const char* *cur=result;
 
 	// IIS5.1 vars
@@ -266,7 +274,7 @@ static bool parser_init() {
 
 		// successful finish
 		return true;
-	} catch(const Exception& e) { // global problem 
+	} catch(.../*const Exception& e*/) { // global problem 
 		//const char* body=e.comment();
 		
 		// unsuccessful finish
@@ -310,7 +318,6 @@ BOOL WINAPI TerminateExtension(
 	@test
 		PARSER_VERSION from outside
 */
-
 void real_parser_handler(SAPI_Info& SAPI_info, bool header_only) {
 	// collect garbage from prev request
 #ifndef PA_DEBUG_DISABLE_GC
@@ -341,7 +348,7 @@ void real_parser_handler(SAPI_Info& SAPI
 		strncpy(buf, filespec_to_process, len); buf[len]=0;
 		request_info.document_root=buf;
 	} else
-		throw Exception("parser.runtime",
+		throw Exception(PARSER_RUNTIME,
 			0,
 			"ISAPI: no PATH_INFO defined (in reinventing DOCUMENT_ROOT)");
 
@@ -391,30 +398,52 @@ void real_parser_handler(SAPI_Info& SAPI
 		header_only);
 }
 
-void call_real_parser_handler__do_SEH(SAPI_Info& SAPI_info, bool header_only) {
-#if _MSC_VER & !defined(_DEBUG)
+#ifdef PA_SUPPRESS_SYSTEM_EXCEPTION
+static const Exception 
+call_real_parser_handler__do_PEH_return_it(
+	SAPI_Info& SAPI_info, bool header_only) 
+{
+	try {
+		real_parser_handler(SAPI_info, header_only);
+	} catch(const Exception& e) {
+		return e;
+	}
+
+	return Exception();
+}
+static void call_real_parser_handler__supress_system_exception(
+	SAPI_Info& SAPI_info, bool header_only) 
+{
+	Exception parser_exception;
 	LPEXCEPTION_POINTERS system_exception=0;
+
 	__try {
-#endif
-		real_parser_handler(SAPI_info, header_only);
-		
-#if _MSC_VER & !defined(_DEBUG)
+		parser_exception=call_real_parser_handler__do_PEH_return_it(
+			SAPI_info, header_only);
 	} __except (
 		(system_exception=GetExceptionInformation()), 
-		EXCEPTION_EXECUTE_HANDLER) {
-		
+		EXCEPTION_EXECUTE_HANDLER) 
+	{
+
 		if(system_exception)
 			if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord)
-				throw Exception(0,
-				0,
-				"Exception 0x%08X at 0x%08X", er->ExceptionCode,  er->ExceptionAddress);
-			else
-				throw Exception(0, 0, "Exception <no exception record>");
+				throw Exception("system",
+					0,
+					"0x%08X at 0x%08X", er->ExceptionCode,  er->ExceptionAddress);
 			else
-				throw Exception(0, 0, "Exception <no exception information>");
+				throw Exception("system", 
+					0, 
+					"<no exception record>");
+		else
+			throw Exception("system", 
+				0, 
+				"<no exception information>");
 	}
-#endif
+
+	if(parser_exception)
+		throw Exception(parser_exception);
 }
+#endif
 
 DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) {
 	//_asm int 3;
@@ -426,7 +455,12 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
 
 	bool header_only=strcasecmp(lpECB->lpszMethod, "HEAD")==0;
 	try { // global try
-		call_real_parser_handler__do_SEH(SAPI_info, header_only);
+#ifdef PA_SUPPRESS_SYSTEM_EXCEPTION
+		call_real_parser_handler__supress_system_exception(
+#else
+		real_parser_handler(
+#endif
+			SAPI_info, header_only);
 		// successful finish
 	} catch(const Exception& e) { // global problem
 		// don't allocate anything on pool here: