--- parser3/src/targets/isapi/parser3isapi.C 2005/11/22 12:48:40 1.95 +++ parser3/src/targets/isapi/parser3isapi.C 2007/11/27 09:58:05 1.99 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_PARSER3ISAPI_C="$Date: 2005/11/22 12:48:40 $"; +static const char * const IDENT_PARSER3ISAPI_C="$Date: 2007/11/27 09:58:05 $"; #ifndef _MSC_VER # error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)] @@ -19,6 +19,7 @@ static const char * const IDENT_PARSER3I #include "pa_version.h" #include "pa_socks.h" +#define WINVER 0x0400 #include #include @@ -76,12 +77,12 @@ public: void SAPI::log(SAPI_Info& SAPI_info, const char* fmt, ...) { va_list args; va_start(args,fmt); - char buf[MAX_STRING]; + char buf[MAX_LOG_STRING]; const char* prefix="PARSER_ERROR:"; strcpy(buf, prefix); char *start=buf+strlen(prefix); - DWORD size=vsnprintf(start, MAX_STRING-strlen(prefix), fmt, args); - remove_crlf(start, start+size); + DWORD size=vsnprintf(start, MAX_LOG_STRING-strlen(prefix), fmt, args); + size=remove_crlf(start, start+size); SAPI_info.lpECB->ServerSupportFunction(SAPI_info.lpECB->ConnID, HSE_APPEND_LOG_PARAMETER, buf, &size, 0); @@ -273,7 +274,7 @@ static bool parser_init() { // successful finish return true; - } catch(const Exception& e) { // global problem + } catch(.../*const Exception& e*/) { // global problem //const char* body=e.comment(); // unsuccessful finish @@ -317,10 +318,6 @@ BOOL WINAPI TerminateExtension( @test PARSER_VERSION from outside */ -#ifndef PA_DEBUG_DISABLE_GC -extern long GC_large_alloc_warn_suppressed; -#endif - void real_parser_handler(SAPI_Info& SAPI_info, bool header_only) { // collect garbage from prev request #ifndef PA_DEBUG_DISABLE_GC @@ -329,7 +326,6 @@ void real_parser_handler(SAPI_Info& SAPI GC_dont_gc=0; GC_gcollect(); GC_dont_gc=saved; - GC_large_alloc_warn_suppressed=0; } #endif @@ -352,7 +348,7 @@ void real_parser_handler(SAPI_Info& SAPI strncpy(buf, filespec_to_process, len); buf[len]=0; request_info.document_root=buf; } else - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, 0, "ISAPI: no PATH_INFO defined (in reinventing DOCUMENT_ROOT)"); @@ -394,7 +390,7 @@ void real_parser_handler(SAPI_Info& SAPI snprintf(config_filespec, MAX_STRING, "%s/%s", beside_binary_path, AUTO_FILE_NAME); - bool fail_on_config_read_problem=true;//entry_exists(config_filespec); + bool fail_on_config_read_problem=entry_exists(config_filespec); // process the request request.core(