--- parser3/src/targets/cgi/parser3.C 2013/07/23 13:07:49 1.264 +++ parser3/src/targets/cgi/parser3.C 2015/10/26 01:22:00 1.269 @@ -1,11 +1,11 @@ /** @file Parser: scripting and CGI main. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.264 2013/07/23 13:07:49 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.269 2015/10/26 01:22:00 moko Exp $"; #include "pa_config_includes.h" @@ -15,6 +15,7 @@ volatile const char * IDENT_PARSER3_C="$ #include "pa_request.h" #include "pa_socks.h" #include "pa_version.h" +#include "pa_vconsole.h" #ifdef _MSC_VER #include @@ -209,14 +210,14 @@ void SAPI::abort(const char* fmt, ...) { // va_end(args); } -char* SAPI::get_env(SAPI_Info& , const char* name) { +char* SAPI::Env::get(SAPI_Info& , const char* name) { if(char *local=getenv(name)) return pa_strdup(local); else return 0; } -const char* const *SAPI::environment(SAPI_Info&) { +const char* const *SAPI::Env::get(SAPI_Info&) { #ifdef _MSC_VER extern char **_environ; return _environ; @@ -612,7 +613,7 @@ static void call_real_parser_handler__su static void usage(const char* program) { printf( "Parser/%s\n" - "Copyright (c) 2001-2013 Art. Lebedev Studio (http://www.artlebedev.com)\n" + "Copyright (c) 2001-2015 Art. Lebedev Studio (http://www.artlebedev.com)\n" "Author: Alexandr Petrosian (http://paf.design.ru)\n" "\n" "Usage: %s [options] file\n" @@ -631,10 +632,9 @@ int main(int argc, char *argv[]) { #ifdef PA_DEBUG_CGI_ENTRY_EXIT log("main: entry"); #endif - //_asm int 3; - GC_java_finalization=0; #ifndef PA_DEBUG_DISABLE_GC + GC_java_finalization=0; // Dont collect unless explicitly requested // this is quicker (~30% ), but less memory-efficient(~8%) // so deciding for speed