--- parser3/src/targets/isapi/parser3isapi.C	2002/04/16 14:41:40	1.69
+++ parser3/src/targets/isapi/parser3isapi.C	2002/06/11 12:20:42	1.72
@@ -4,7 +4,7 @@
 	Copyright (c) 2000,2001, 2002 ArtLebedev Group (http://www.artlebedev.com)
 	Author: Alexandr Petrosian <paf@design.ru> (http://paf.design.ru)
 
-	$Id: parser3isapi.C,v 1.69 2002/04/16 14:41:40 paf Exp $
+	$Id: parser3isapi.C,v 1.72 2002/06/11 12:20:42 paf Exp $
 */
 
 #ifndef _MSC_VER
@@ -119,6 +119,68 @@ const char *SAPI::get_env(Pool& pool, co
 	return 0;
 }
 
+static int grep_char(const char *s, char c) {
+	int result=0;
+	if(s) {
+		while(s=strchr(s, c)) {
+			s++; // skip found c
+			result++;
+		}
+	}
+	return result;
+}
+static const char *mk_env_pair(Pool& pool, const char *key, const char *value) {
+	char *result=(char *)pool.malloc(strlen(key)+1/*=*/+strlen(value)+1/*0*/);
+	strcpy(result, key); strcat(result, "="); strcat(result, value);
+	return result;
+}
+const char *const *SAPI::environment(Pool& pool) {
+	const char *IIS51vars[]={
+		"APPL_MD_PATH", "APPL_PHYSICAL_PATH",
+		"AUTH_PASSWORD", "AUTH_TYPE", "AUTH_USER",
+		"CERT_COOKIE", "CERT_FLAGS", "CERT_ISSUER", "CERT_KEYSIZE", "CERT_SECRETKEYSIZE",
+		"CERT_SERIALNUMBER", "CERT_SERVER_ISSUER", "CERT_SERVER_SUBJECT", "CERT_SUBJECT",
+		"CONTENT_LENGTH", "CONTENT_TYPE",
+		"LOGON_USER",
+		"HTTPS", "HTTPS_KEYSIZE", "HTTPS_SECRETKEYSIZE", "HTTPS_SERVER_ISSUER", "HTTPS_SERVER_SUBJECT",
+		"INSTANCE_ID", 	"INSTANCE_META_PATH",
+		"PATH_INFO", 	"PATH_TRANSLATED",
+		"QUERY_STRING",
+		"REMOTE_ADDR", "REMOTE_HOST", "REMOTE_USER", "REQUEST_METHOD",
+		"SCRIPT_NAME",
+		"SERVER_NAME", "SERVER_PORT", "SERVER_PORT_SECURE", "SERVER_PROTOCOL", "SERVER_SOFTWARE",
+		"URL",
+	};
+	const int IIS51var_count=sizeof(IIS51vars)/sizeof(*IIS51vars);
+
+	// we know this buf is writable
+	char *all_http_vars=const_cast<char *>(SAPI::get_env(pool, "ALL_HTTP"));
+	const int http_var_count=grep_char(all_http_vars, '\n')+1/*\n for theoretical(never saw) this \0*/;
+	
+	const char **result=
+		(const char **)pool.malloc(sizeof(char *)*(IIS51var_count+http_var_count+1/*0*/));
+	const char **cur=result;
+
+	// IIS5.1 vars
+	for(int i=0; i<IIS51var_count; i++) {
+		const char *key=IIS51vars[i];
+		if(const char *value=SAPI::get_env(pool, key))
+			*cur++=mk_env_pair(pool, key, value);
+	}
+
+	// HTTP_* vars
+	if(char *s=all_http_vars) {
+		while(char *key=lsplit(&s, '\n'))
+			if(char *value=lsplit(key, ':'))
+				*cur++=mk_env_pair(pool, key, value);
+	}
+	
+	// mark EOE
+	*cur=0; 
+
+	return result;
+}
+
 size_t SAPI::read_post(Pool& pool, char *buf, size_t max_bytes) {
 	SAPI_func_context& ctx=*static_cast<SAPI_func_context *>(pool.get_context());
 
@@ -215,6 +277,9 @@ int failed_new(size_t size) {
 	return 0; // not reached
 }
 
+#ifdef _DEBUG
+static Pool_storage *global_pool_storagep;
+#endif
 static bool parser_init() {
 	static bool globals_inited=false;
 	if(globals_inited)
@@ -224,6 +289,9 @@ static bool parser_init() {
 	_set_new_handler(failed_new);
 
 	static Pool_storage pool_storage;
+#ifdef _DEBUG
+	global_pool_storagep=&pool_storage;
+#endif
 	static Pool pool(&pool_storage); // global pool
 	try {
 		// init socks
@@ -304,14 +372,18 @@ void real_parser_handler(Pool& pool, LPE
 	request_info.content_type=lpECB->lpszContentType;
 	request_info.content_length=lpECB->cbTotalBytes;
 	request_info.cookie=SAPI::get_env(pool, "HTTP_COOKIE");
-	request_info.user_agent=SAPI::get_env(pool, "HTTP_USER_AGENT");
 
 	
 	// prepare to process request
 	Request request(pool,
 		request_info,
 		String::UL_HTML|String::UL_OPTIMIZE_BIT,
-		false /* status_allowed */);
+#ifdef _DEBUG
+		true
+#else
+		false 
+#endif
+			/* status_allowed */);
 
 	// some root-controlled location
 	//   c:\windows
@@ -372,8 +444,7 @@ void call_real_parser_handler__do_SEH(Po
 #endif
 }
 
-
-DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) {
+inline DWORD RealHttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) {
 	Pool_storage pool_storage;
 	Pool pool(&pool_storage); // no allocations until assigned context [for reporting]
 	SAPI_func_context ctx={
@@ -382,7 +453,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
 		200 // default http_response_code
 	};
 	pool.set_context(&ctx);// no allocations before this line!
-	
+
 	bool header_only=strcasecmp(lpECB->lpszMethod, "HEAD")==0;
 	try { // global try
 		call_real_parser_handler__do_SEH(pool, lpECB, header_only);
@@ -456,10 +527,38 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
 	lpECB->WriteClient(lpECB->ConnID, 
 		(void *)body, &num_bytes, HSE_IO_SYNC);
 */
-
 	return HSE_STATUS_SUCCESS_AND_KEEP_CONN;
 }
 
+#ifdef _DEBUG
+//for memory leaks detection only
+#undef _WINDOWS_
+#include <afx.h>
+#endif
+DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) {
+// Declare the variables needed
+#ifdef _DEBUG
+//	_crtBreakAlloc=97779;//97777; //997;
+
+    CMemoryState oldMemState, newMemState, diffMemState;
+    oldMemState.Checkpoint();
+	//global_pool_storagep->fbreak_on_alloc=true;
+#endif
+	
+	DWORD result=RealHttpExtensionProc(lpECB);
+
+#ifdef _DEBUG
+    newMemState.Checkpoint();
+    if( diffMemState.Difference( oldMemState, newMemState ) )
+    {
+        TRACE( "Memory leaked!\n" );
+		diffMemState.DumpStatistics( );
+		diffMemState.DumpAllObjectsSince();
+    }
+#endif
+	return result;
+}
+
 BOOL WINAPI DllMain(
   HINSTANCE hinstDLL,  // handle to the DLL module
   DWORD fdwReason,     // reason for calling function