--- parser3/src/targets/isapi/parser3isapi.C 2001/04/19 15:38:03 1.30 +++ parser3/src/targets/isapi/parser3isapi.C 2001/09/15 14:22:47 1.41 @@ -4,9 +4,8 @@ Copyright (c) 2000,2001 ArtLebedev Group (http://www.artlebedev.com) Author: Alexander Petrosyan (http://design.ru/paf) - - $Id: parser3isapi.C,v 1.30 2001/04/19 15:38:03 paf Exp $ */ +static const char *RCSId="$Id: parser3isapi.C,v 1.41 2001/09/15 14:22:47 parser Exp $"; #ifndef _MSC_VER # error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)] @@ -28,16 +27,17 @@ // SAPI -/** +#ifndef DOXYGEN +/* ISAPI SAPI functions receive this context information. - - @see Pool::set_context + see Pool::set_context */ struct SAPI_func_context { LPEXTENSION_CONTROL_BLOCK lpECB; String *header; DWORD http_response_code; }; +#endif // goes to 'cs-uri-query' log file field. webmaster: switch it ON[default OFF]. void SAPI::log(Pool& pool, const char *fmt, ...) { @@ -181,6 +181,8 @@ static bool parser_init() { // init socks init_socks(pool); + // init global classes + init_methoded_array(pool); // init global variables pa_globals_init(pool); @@ -198,7 +200,8 @@ static bool 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); + strncpy(pVer->lpszExtensionDesc, "Parser "PARSER_VERSION, HSE_MAX_EXT_DLL_NAME_LEN-1); + pVer->lpszExtensionDesc[HSE_MAX_EXT_DLL_NAME_LEN-1]=0; return parser_init(); } @@ -210,6 +213,8 @@ BOOL WINAPI GetExtensionVersion(HSE_VERS to do that we need to consult metabase, wich is tested&works but seems slow runtime and not could-be-quickly-implemented if prepared. + @test + PARSER_VERSION from outside */ DWORD WINAPI HttpExtensionProc(LPEXTENSION_CONTROL_BLOCK lpECB) { Pool_storage pool_storage; @@ -217,8 +222,9 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI SAPI_func_context ctx={ lpECB, 0, // filling later: so that if there would be error pool would have ctx - 200 + 200 // default http_response_code }; + _asm nop; // int 3; pool.set_context(&ctx);// no allocations before this line! bool header_only=strcasecmp(lpECB->lpszMethod, "HEAD")==0; @@ -239,8 +245,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI // IIS size_t len=strlen(filespec_to_process)-strlen(path_info); char *buf=(char *)pool.malloc(len+1); - strncpy(buf, filespec_to_process, len); - buf[len]=0; + strncpy(buf, filespec_to_process, len); buf[len]=0; request_info.document_root=buf; } else PTHROW(0, 0, @@ -270,7 +275,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI // prepare to process request Request request(pool, request_info, - String::UL_HTML_TYPO + String::UL_USER_HTML ); // some root-controlled location @@ -289,7 +294,7 @@ DWORD WINAPI HttpExtensionProc(LPEXTENSI } PCATCH(e) { // global problem // don't allocate anything on pool here: // possible pool' exception not catch-ed now - // and there could be out-of-memory exception + // 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);