--- parser3/src/targets/isapi/parser3isapi.C	2004/04/01 11:43:54	1.89
+++ parser3/src/targets/isapi/parser3isapi.C	2005/08/24 09:20:57	1.92.8.2
@@ -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/04/01 11:43:54 $";
+static const char * const IDENT_PARSER3ISAPI_C="$Date: 2005/08/24 09:20:57 $";
 
 #ifndef _MSC_VER
 #	error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)]
@@ -24,6 +24,13 @@ static const char * const IDENT_PARSER3I
 
 #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
@@ -48,7 +55,8 @@ const int IIS51var_count=sizeof(IIS51var
 
 // globals
 
-char argv0[MAX_STRING]="";
+char argv0buf[MAX_STRING]="";
+const char* argv0;
 
 // SAPI
 
@@ -93,14 +101,14 @@ void SAPI::die(const char* fmt, ...) {
 	va_list args;
 	va_start(args, fmt);
 	::abort(fmt, args);
-	va_end(args);
+//	va_end(args);
 }
 
 void SAPI::abort(const char* fmt, ...) {
 	va_list args;
 	va_start(args, fmt);
 	::abort(fmt, args);
-	va_end(args);
+//	va_end(args);
 }
 
 char* SAPI::get_env(SAPI_Info& SAPI_info, const char* name) {
@@ -147,8 +155,8 @@ const char* const *SAPI::environment(SAP
 	// we know this buf is writable
 	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
@@ -243,10 +251,12 @@ void SAPI::send_header(SAPI_Info& SAPI_i
 		HSE_REQ_SEND_RESPONSE_HEADER_EX, &header_info, NULL, NULL);
 }
 
-void SAPI::send_body(SAPI_Info& SAPI_info, const void *buf, size_t size) {
+size_t SAPI::send_body(SAPI_Info& SAPI_info, const void *buf, size_t size) {
 	DWORD num_bytes=size;
-	SAPI_info.lpECB->WriteClient(SAPI_info.lpECB->ConnID, 
-		const_cast<void *>(buf), &num_bytes, HSE_IO_SYNC);
+	if(!SAPI_info.lpECB->WriteClient(SAPI_info.lpECB->ConnID, 
+		const_cast<void *>(buf), &num_bytes, HSE_IO_SYNC))
+		return 0;
+	return (size_t)num_bytes;
 }
 
 
@@ -389,30 +399,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);
+				throw Exception("system",
+					0,
+					"0x%08X at 0x%08X", er->ExceptionCode,  er->ExceptionAddress);
 			else
-				throw Exception(0, 0, "Exception <no exception record>");
-			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;
@@ -424,7 +456,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:
@@ -506,9 +543,13 @@ BOOL WINAPI DllMain(
 
 	GetModuleFileName(
 	  hinstDLL,    // handle to module
-	  argv0,  // file name of module
-	  sizeof(argv0)         // size of buffer
+	  argv0buf,  // file name of module
+	  sizeof(argv0buf)         // size of buffer
 	);
 
+	argv0=argv0buf;
+	if(strncmp(argv0buf, "\\\\?\\", 4)==0)
+		argv0+=4;
+
 	return TRUE;
 }
\ No newline at end of file