--- parser3/src/targets/isapi/parser3isapi.C 2001/04/07 14:23:41 1.24 +++ parser3/src/targets/isapi/parser3isapi.C 2001/04/10 10:32:13 1.28 @@ -14,8 +14,6 @@ #include "pool_storage.h" #include "pa_socks.h" -/// @todo init_socks - #define MAX_STATUS_LENGTH sizeof("xxxx LONGEST STATUS DESCRIPTION") // SAPI @@ -31,6 +29,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(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(pool.context()); @@ -54,7 +67,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(pool.context()); DWORD read_from_buf=0; @@ -145,21 +158,6 @@ void SAPI::send_body(Pool& pool, const v const_cast(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(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); -} - // static bool parser_init() { @@ -170,6 +168,9 @@ static bool parser_init() { static Pool pool(0); // global pool PTRY { + // init socks + init_socks(pool); + // init global variables pa_globals_init(pool); @@ -290,7 +291,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI char header_buf[MAX_STRING]; int header_len=snprintf(header_buf, MAX_STRING, "content-type: text/plain\n" - "content-length: %ul\n" + "content-length: %lu\n" "expires: Fri, 23 Mar 2001 09:32:23 GMT\n" "\n", content_length);