--- parser3/src/targets/isapi/parser3isapi.C 2001/03/24 14:31:02 1.16 +++ parser3/src/targets/isapi/parser3isapi.C 2001/04/03 07:20:55 1.22 @@ -13,12 +13,15 @@ #include "pa_version.h" #include "pool_storage.h" -#include "nt_log_events.h" - #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; @@ -94,7 +97,7 @@ void SAPI::add_header_attribute(Pool& po } } -/// @todo intelligent cache-control +/// @todo parser4: intelligent cache-control void SAPI::send_header(Pool& pool) { SAPI_func_context& ctx=*static_cast(pool.context()); @@ -139,7 +142,7 @@ void SAPI::send_body(Pool& pool, const c const_cast(buf), &num_bytes, HSE_IO_SYNC); } -/// goes to 'cs-uri-query' log file field. webmaster: switch it ON[default OFF]. +// 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()); @@ -153,7 +156,6 @@ void SAPI::log(Pool& pool, const char *f ctx.lpECB->ServerSupportFunction(ctx.lpECB->ConnID, HSE_APPEND_LOG_PARAMETER, buf, &size, 0); } -//@} // @@ -189,7 +191,7 @@ BOOL WINAPI GetExtensionVersion(HSE_VERS /** ISAPI // main workhorse - @todo + @todo parser4: IIS: remove trailing default-document[index.html] from $request.uri. to do that we need to consult metabase, wich is tested&works but seems slow runtime @@ -200,8 +202,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! @@ -248,6 +250,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,