--- parser3/src/targets/isapi/parser3isapi.C 2005/08/24 09:20:57 1.92.8.2 +++ parser3/src/targets/isapi/parser3isapi.C 2007/08/17 09:01:29 1.98 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_PARSER3ISAPI_C="$Date: 2005/08/24 09:20:57 $"; +static const char * const IDENT_PARSER3ISAPI_C="$Date: 2007/08/17 09:01:29 $"; #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 @@ -55,8 +56,7 @@ const int IIS51var_count=sizeof(IIS51var // globals -char argv0buf[MAX_STRING]=""; -const char* argv0; +char argv0[MAX_STRING]=""; // SAPI @@ -274,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 @@ -318,7 +318,6 @@ BOOL WINAPI TerminateExtension( @test PARSER_VERSION from outside */ - void real_parser_handler(SAPI_Info& SAPI_info, bool header_only) { // collect garbage from prev request #ifndef PA_DEBUG_DISABLE_GC @@ -349,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)"); @@ -543,13 +542,9 @@ BOOL WINAPI DllMain( GetModuleFileName( hinstDLL, // handle to module - argv0buf, // file name of module - sizeof(argv0buf) // size of buffer + argv0, // file name of module + sizeof(argv0) // size of buffer ); - argv0=argv0buf; - if(strncmp(argv0buf, "\\\\?\\", 4)==0) - argv0+=4; - return TRUE; } \ No newline at end of file