--- parser3/src/targets/isapi/parser3isapi.C 2015/10/26 01:22:00 1.108 +++ parser3/src/targets/isapi/parser3isapi.C 2019/12/25 22:22:07 1.112 @@ -1,11 +1,11 @@ /** @file Parser: IIS extension. - Copyright (c) 2000-2015 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2000-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -volatile const char * IDENT_PARSER3ISAPI_C="$Id: parser3isapi.C,v 1.108 2015/10/26 01:22:00 moko Exp $"; +volatile const char * IDENT_PARSER3ISAPI_C="$Id: parser3isapi.C,v 1.112 2019/12/25 22:22:07 moko Exp $"; #ifndef _MSC_VER # error compile ISAPI module with MSVC [no urge for now to make it autoconf-ed (PAF)] @@ -17,7 +17,6 @@ volatile const char * IDENT_PARSER3ISAPI #include "pa_globals.h" #include "pa_request.h" #include "pa_version.h" -#include "pa_socks.h" #include #include @@ -26,7 +25,7 @@ volatile const char * IDENT_PARSER3ISAPI // defines -#if _MSC_VER && !defined(_DEBUG) +#if defined(_MSC_VER) && !defined(_DEBUG) # define PA_SUPPRESS_SYSTEM_EXCEPTION #endif @@ -267,27 +266,19 @@ static bool parser_init() { globals_inited=true; try { - // init socks - pa_socks_init(); - // init global variables + // init libraries pa_globals_init(); - // successful finish return true; } catch(.../*const Exception& e*/) { // global problem - //const char* body=e.comment(); - // unsuccessful finish return false; } } static void parser_done() { - // finalize global variables + // finalize libraries pa_globals_done(); - - // - pa_socks_done(); } /// ISAPI // @@ -321,12 +312,9 @@ BOOL WINAPI TerminateExtension( void real_parser_handler(SAPI_Info& SAPI_info, bool header_only) { // collect garbage from prev request #ifndef PA_DEBUG_DISABLE_GC - { - int saved=GC_dont_gc; - GC_dont_gc=0; - GC_gcollect(); - GC_dont_gc=saved; - } + GC_dont_gc=0; + GC_gcollect(); + GC_dont_gc=1; #endif SAPI_info.header=new String;