--- parser3/src/targets/isapi/parser3isapi.C	2001/04/03 07:32:49	1.23
+++ parser3/src/targets/isapi/parser3isapi.C	2001/04/09 15:49:03	1.26
@@ -12,6 +12,10 @@
 #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")
 
@@ -28,6 +32,21 @@ struct SAPI_func_context {
 	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());
 
@@ -51,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;
@@ -142,19 +161,11 @@ void SAPI::send_body(Pool& pool, const v
 		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);
 }
 
 //