--- parser3/src/targets/isapi/parser3isapi.C 2001/03/24 09:24:46 1.14 +++ parser3/src/targets/isapi/parser3isapi.C 2001/04/09 15:49:03 1.26 @@ -12,19 +12,43 @@ #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 -struct sapi_func_context { +// 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(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()); + SAPI_func_context& ctx=*static_cast(pool.context()); char *variable_buf=(char *)pool.malloc(MAX_STRING); DWORD variable_len = MAX_STRING-1; @@ -46,8 +70,8 @@ const char *SAPI::get_env(Pool& pool, co return 0; } -uint SAPI::read_post(Pool& pool, char *buf, uint max_bytes) { - sapi_func_context& ctx=*static_cast(pool.context()); +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; DWORD read_from_input=0; @@ -77,7 +101,7 @@ uint SAPI::read_post(Pool& pool, char *b } void SAPI::add_header_attribute(Pool& pool, const char *key, const char *value) { - sapi_func_context& ctx=*static_cast(pool.context()); + SAPI_func_context& ctx=*static_cast(pool.context()); if(strcasecmp(key, "location")==0) ctx.http_response_code=302; @@ -94,7 +118,7 @@ void SAPI::add_header_attribute(Pool& po /// @todo intelligent cache-control void SAPI::send_header(Pool& pool) { - sapi_func_context& ctx=*static_cast(pool.context()); + SAPI_func_context& ctx=*static_cast(pool.context()); ctx.header->APPEND_CONST( "expires: Fri, 23 Mar 2001 09:32:23 GMT\n" @@ -129,21 +153,27 @@ 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) { - sapi_func_context& ctx=*static_cast(pool.context()); +void SAPI::send_body(Pool& pool, const void *buf, size_t size) { + SAPI_func_context& ctx=*static_cast(pool.context()); DWORD num_bytes=size; ctx.lpECB->WriteClient(ctx.lpECB->ConnID, - const_cast(buf), &num_bytes, HSE_IO_SYNC); + const_cast(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 void parser_init() { +static bool parser_init() { static bool globals_inited=false; if(globals_inited) - return; + return true; globals_inited=true; static Pool pool(0); // global pool @@ -151,10 +181,13 @@ static void parser_init() { // init global variables pa_globals_init(pool); - //... + // successful finish + return true; } PCATCH(e) { // global problem - const char *body=e.comment(); - // TODO: somehow report that error + //const char *body=e.comment(); + + // unsuccessful finish + return false; } PEND_CATCH } @@ -162,8 +195,8 @@ static void 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); - return TRUE; + strncpy(pVer->lpszExtensionDesc, "Parser "PARSER_VERSION, HSE_MAX_EXT_DLL_NAME_LEN); + return parser_init(); } /** @@ -177,16 +210,16 @@ BOOL WINAPI GetExtensionVersion(HSE_VERS */ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { Pool_storage pool_storage; - Pool pool(&pool_storage); + 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 + }; + pool.set_context(&ctx);// no allocations before this line! bool header_only=strcasecmp(lpECB->lpszMethod, "HEAD")==0; PTRY { // global try - sapi_func_context ctx={ - lpECB, - 0, // filling later: so that if there would be error pool would have ctx - 200 - }; - pool.set_context(&ctx); ctx.header=new(pool) String(pool); // Request info @@ -228,13 +261,15 @@ 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, request_info, String::UL_HTML_TYPO ); - + // some root-controlled location // c:\windows // must be dynamic: rethrowing from request.core @@ -253,6 +288,10 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI // possible pool' exception not catch-ed now // 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); + + // int content_length=strlen(body); // prepare header // not using SAPI func wich allocates on pool @@ -286,22 +325,3 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI return HSE_STATUS_SUCCESS_AND_KEEP_CONN; } - - -BOOL APIENTRY DllMain(HANDLE hModule, - DWORD ul_reason_for_call, - LPVOID lpReserved - ) { - switch (ul_reason_for_call) { - case DLL_PROCESS_ATTACH: - parser_init(); - break; - case DLL_THREAD_ATTACH: - break; - case DLL_THREAD_DETACH: - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -}