--- parser3/src/targets/isapi/parser3isapi.C	2001/04/09 15:49:03	1.26
+++ parser3/src/targets/isapi/parser3isapi.C	2001/09/15 14:22:47	1.41
@@ -1,3 +1,12 @@
+/** @file
+	Parser: IIS extension.
+
+	Copyright (c) 2000,2001 ArtLebedev Group (http://www.artlebedev.com)
+
+	Author: Alexander Petrosyan <paf@design.ru> (http://design.ru/paf)
+*/
+static const char *RCSId="$Id: parser3isapi.C,v 1.41 2001/09/15 14:22:47 parser Exp $"; 
+
 #ifndef _MSC_VER
 #	error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)]
 #endif
@@ -13,24 +22,22 @@
 #include "pa_version.h"
 #include "pool_storage.h"
 #include "pa_socks.h"
-#include "pa_exec.h"
-
-/// @todo init_socks
 
 #define MAX_STATUS_LENGTH sizeof("xxxx LONGEST STATUS DESCRIPTION")
 
 // SAPI
 
-/** 
+#ifndef DOXYGEN
+/*
 	ISAPI SAPI functions receive this context information. 
-
-	@see Pool::set_context
+	see Pool::set_context
 */
 struct SAPI_func_context {
 	LPEXTENSION_CONTROL_BLOCK lpECB;
 	String *header;
 	DWORD http_response_code;
 };
+#endif
 
 // goes to 'cs-uri-query' log file field. webmaster: switch it ON[default OFF].
 void SAPI::log(Pool& pool, const char *fmt, ...) {
@@ -112,7 +119,7 @@ void SAPI::add_header_attribute(Pool& po
 		ctx.header->APPEND_CONST(key);
 		ctx.header->APPEND_CONST(": ");
 		ctx.header->APPEND_CONST(value);
-		ctx.header->APPEND_CONST("\n");
+		ctx.header->APPEND_CONST("\r\n");
 	}
 }
 
@@ -121,8 +128,8 @@ void SAPI::send_header(Pool& pool) {
 	SAPI_func_context& ctx=*static_cast<SAPI_func_context *>(pool.context());
 
 	ctx.header->APPEND_CONST(
-		"expires: Fri, 23 Mar 2001 09:32:23 GMT\n"
-		"\n");
+		"expires: Fri, 23 Mar 2001 09:32:23 GMT\r\n"
+		"\r\n");
 	HSE_SEND_HEADER_EX_INFO header_info;
 
 	char status_buf[MAX_STATUS_LENGTH];
@@ -161,13 +168,6 @@ void SAPI::send_body(Pool& pool, const v
 		const_cast<void *>(buf), &num_bytes, HSE_IO_SYNC);
 }
 
-int SAPI::execute(const String& file_spec, 
-	const Hash *env,
-	const Array *argv,
-	const String& in, String& out, String& err) {
-	return pa_exec(file_spec, env, argv, in,  out, err);
-}
-
 // 
 
 static bool parser_init() {
@@ -178,6 +178,11 @@ static bool parser_init() {
 
 	static Pool pool(0); // global pool
 	PTRY {
+		// init socks
+		init_socks(pool);
+
+		// init global classes
+		init_methoded_array(pool);
 		// init global variables
 		pa_globals_init(pool);
 		
@@ -195,7 +200,8 @@ static bool parser_init() {
 /// ISAPI //
 BOOL WINAPI GetExtensionVersion(HSE_VERSION_INFO *pVer) {
 	pVer->dwExtensionVersion = HSE_VERSION;
-	strncpy(pVer->lpszExtensionDesc, "Parser "PARSER_VERSION, HSE_MAX_EXT_DLL_NAME_LEN);
+	strncpy(pVer->lpszExtensionDesc, "Parser "PARSER_VERSION, HSE_MAX_EXT_DLL_NAME_LEN-1);
+	pVer->lpszExtensionDesc[HSE_MAX_EXT_DLL_NAME_LEN-1]=0;
 	return parser_init();
 }
 
@@ -207,6 +213,8 @@ BOOL WINAPI GetExtensionVersion(HSE_VERS
 		to do that we need to consult metabase,
 		wich is tested&works but seems slow runtime 
 		and not could-be-quickly-implemented if prepared.
+	@test
+		PARSER_VERSION from outside
 */
 DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) {
 	Pool_storage pool_storage;
@@ -214,8 +222,9 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
 	SAPI_func_context ctx={
 		lpECB,
 		0, // filling later: so that if there would be error pool would have ctx
-		200
+		200 // default http_response_code
 	};
+	_asm nop; // int 3;
 	pool.set_context(&ctx);// no allocations before this line!
 	
 	bool header_only=strcasecmp(lpECB->lpszMethod, "HEAD")==0;
@@ -236,8 +245,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
 			// IIS
 			size_t len=strlen(filespec_to_process)-strlen(path_info);
 			char *buf=(char *)pool.malloc(len+1);
-			strncpy(buf, filespec_to_process, len);
-			buf[len]=0;
+			strncpy(buf, filespec_to_process, len); buf[len]=0;
 			request_info.document_root=buf;
 		} else
 			PTHROW(0, 0,
@@ -267,7 +275,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
 		// prepare to process request
 		Request request(pool,
 			request_info,
-			String::UL_HTML_TYPO
+			String::UL_USER_HTML
 			);
 
 		// some root-controlled location
@@ -286,7 +294,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
 	} PCATCH(e) { // global problem
 		// don't allocate anything on pool here:
 		//   possible pool' exception not catch-ed now
-		//   and there could be out-of-memory exception
+			//   and there could be out-of-memory exception
 		const char *body=e.comment();
 		// log it
 		SAPI::log(pool, "exception in request exception handler: %s", body);
@@ -297,10 +305,10 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
 		// prepare header // not using SAPI func wich allocates on pool
 		char header_buf[MAX_STRING];
 		int header_len=snprintf(header_buf, MAX_STRING,
-			"content-type: text/plain\n"
-			"content-length: %ul\n"
-			"expires: Fri, 23 Mar 2001 09:32:23 GMT\n"
-			"\n",
+			"content-type: text/plain\r\n"
+			"content-length: %lu\r\n"
+			"expires: Fri, 23 Mar 2001 09:32:23 GMT\r\n"
+			"\r\n",
 			content_length);
 
 		HSE_SEND_HEADER_EX_INFO header_info;