--- parser3/src/targets/isapi/parser3isapi.C	2003/11/21 09:38:14	1.85
+++ parser3/src/targets/isapi/parser3isapi.C	2004/04/05 13:37:06	1.90
@@ -1,11 +1,11 @@
 /** @file
 	Parser: IIS extension.
 
-	Copyright (c) 2000,2001-2003 ArtLebedev Group (http://www.artlebedev.com)
+	Copyright (c) 2000,2001-2004 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 */
 
-static const char * const IDENT_PARSER3ISAPI_C="$Date: 2003/11/21 09:38:14 $";
+static const char * const IDENT_PARSER3ISAPI_C="$Date: 2004/04/05 13:37:06 $";
 
 #ifndef _MSC_VER
 #	error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)]
@@ -93,14 +93,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,7 +147,7 @@ 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* *cur=result;
 
@@ -258,7 +258,7 @@ static bool parser_init() {
 
 	try {
 		// init socks
-		pa_init_socks();
+		pa_socks_init();
 		// init global variables
 		pa_globals_init();
 
@@ -272,6 +272,14 @@ static bool parser_init() {
 	}
 }
 
+static void parser_done() {
+	// finalize global variables
+	pa_globals_done();
+
+	// 
+	pa_socks_done();
+}
+
 /// ISAPI //
 BOOL WINAPI GetExtensionVersion(HSE_VERSION_INFO *pVer) {
 	pVer->dwExtensionVersion = HSE_VERSION;
@@ -279,6 +287,15 @@ BOOL WINAPI GetExtensionVersion(HSE_VERS
 	pVer->lpszExtensionDesc[HSE_MAX_EXT_DLL_NAME_LEN-1]=0;
 	return parser_init();
 }
+// dwFlags & HSE_TERM_MUST_UNLOAD means we can't return false
+BOOL WINAPI TerminateExtension(
+  DWORD /*dwFlags*/
+)
+{
+	parser_done();
+
+	return TRUE;
+}
 
 /** 
 	ISAPI // main workhorse
@@ -293,6 +310,16 @@ BOOL WINAPI GetExtensionVersion(HSE_VERS
 */
 
 void real_parser_handler(SAPI_Info& SAPI_info, bool header_only) {
+	// collect garbage from prev request
+#ifndef PA_DEBUG_DISABLE_GC
+	{
+		int saved=GC_dont_gc;
+		GC_dont_gc=0;
+		GC_gcollect();
+		GC_dont_gc=saved;
+	}
+#endif
+	
 	SAPI_info.header=new String;
 	LPEXTENSION_CONTROL_BLOCK lpECB=SAPI_info.lpECB;
 	
@@ -414,7 +441,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
 		char header_buf[MAX_STRING];
 		int header_len=snprintf(header_buf, MAX_STRING,
 			"content-type: text/plain\r\n"
-			"content-length: %lu\r\n"
+			"content-length: %u\r\n"
 //			"expires: Fri, 23 Mar 2001 09:32:23 GMT\r\n"
 			"\r\n",
 			content_length);
@@ -447,7 +474,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
 		char header_buf[MAX_STRING];
 		int header_len=snprintf(header_buf, MAX_STRING,
 			"content-type: text/plain\r\n"
-			"content-length: %lu\r\n"
+			"content-length: %u\r\n"
 			"expires: Fri, 23 Mar 2001 09:32:23 GMT\r\n"
 			"\r\n",
 			content_length);