--- parser3/src/targets/isapi/parser3isapi.C	2001/03/24 15:58:02	1.17
+++ parser3/src/targets/isapi/parser3isapi.C	2001/04/09 15:49:03	1.26
@@ -12,17 +12,41 @@
 #include "pa_request.h"
 #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 funcs decl
+// SAPI
+
+/** 
+	ISAPI SAPI functions receive this context information. 
+
+	@see Pool::set_context
+*/
 struct SAPI_func_context {
 	LPEXTENSION_CONTROL_BLOCK lpECB;
 	String *header;
 	DWORD http_response_code;
 };
 
+// goes to 'cs-uri-query' log file field. webmaster: switch it ON[default OFF].
+void SAPI::log(Pool& pool, const char *fmt, ...) {
+	SAPI_func_context& ctx=*static_cast<SAPI_func_context *>(pool.context());
+	
+	va_list args;
+	va_start(args,fmt);
+	char buf[MAX_STRING];
+	const char *prefix="PARSER_ERROR:";
+	strcpy(buf, prefix);
+	DWORD size=vsnprintf(buf+strlen(prefix), MAX_STRING-strlen(prefix), fmt, args);
+	
+	ctx.lpECB->ServerSupportFunction(ctx.lpECB->ConnID, 
+		HSE_APPEND_LOG_PARAMETER, buf, &size, 0);
+}
+
 const char *SAPI::get_env(Pool& pool, const char *name) {
 	SAPI_func_context& ctx=*static_cast<SAPI_func_context *>(pool.context());
 
@@ -46,7 +70,7 @@ const char *SAPI::get_env(Pool& pool, co
 	return 0;
 }
 
-uint SAPI::read_post(Pool& pool, char *buf, uint max_bytes) {
+size_t SAPI::read_post(Pool& pool, char *buf, size_t max_bytes) {
 	SAPI_func_context& ctx=*static_cast<SAPI_func_context *>(pool.context());
 
 	DWORD read_from_buf=0;
@@ -129,29 +153,20 @@ void SAPI::send_header(Pool& pool) {
 		HSE_REQ_SEND_RESPONSE_HEADER_EX, &header_info, NULL, NULL);
 }
 
-void SAPI::send_body(Pool& pool, const char *buf, size_t size) {
+void SAPI::send_body(Pool& pool, const void *buf, size_t size) {
 	SAPI_func_context& ctx=*static_cast<SAPI_func_context *>(pool.context());
 
 	DWORD num_bytes=size;
 	ctx.lpECB->WriteClient(ctx.lpECB->ConnID, 
-		const_cast<char *>(buf), &num_bytes, HSE_IO_SYNC);
+		const_cast<void *>(buf), &num_bytes, HSE_IO_SYNC);
 }
 
-/// goes to 'cs-uri-query' log file field. webmaster: switch it ON[default OFF].
-void SAPI::log(Pool& pool, const char *fmt, ...) {
-	SAPI_func_context& ctx=*static_cast<SAPI_func_context *>(pool.context());
-	
-	va_list args;
-	va_start(args,fmt);
-	char buf[MAX_STRING];
-	const char *prefix="PARSER_ERROR:";
-	strcpy(buf, prefix);
-	DWORD size=vsnprintf(buf+strlen(prefix), MAX_STRING-strlen(prefix), fmt, args);
-	
-	ctx.lpECB->ServerSupportFunction(ctx.lpECB->ConnID, 
-		HSE_APPEND_LOG_PARAMETER, buf, &size, 0);
+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);
 }
-//@}
 
 // 
 
@@ -198,8 +213,8 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
 	Pool pool(&pool_storage); // no allocations until assigned context [for reporting]
 	SAPI_func_context ctx={
 		lpECB,
-			0, // filling later: so that if there would be error pool would have ctx
-			200
+		0, // filling later: so that if there would be error pool would have ctx
+		200
 	};
 	pool.set_context(&ctx);// no allocations before this line!
 	
@@ -246,6 +261,8 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI
 		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,