--- parser3/src/targets/apache/mod_parser3_core.C 2012/04/18 13:34:40 1.7 +++ parser3/src/targets/apache/mod_parser3_core.C 2020/08/13 13:00:28 1.22 @@ -1,11 +1,11 @@ /** @file -Parser: apache 1.3 module, part, compiled by parser3project. +Parser: apache 1.3/2.X module, part, compiled by parser3project. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -volatile const char * IDENT_MOD_PARSER3_CORE_C="$Id: mod_parser3_core.C,v 1.7 2012/04/18 13:34:40 moko Exp $"; +volatile const char * IDENT_MOD_PARSER3_CORE_C="$Id: mod_parser3_core.C,v 1.22 2020/08/13 13:00:28 moko Exp $"; #include "pa_config_includes.h" @@ -17,9 +17,8 @@ volatile const char * IDENT_MOD_PARSER3_ #include "pa_sapi.h" #include "classes.h" #include "pa_request.h" -#include "pa_socks.h" -#if _MSC_VER && !defined(_DEBUG) +#if defined(_MSC_VER) && !defined(_DEBUG) # include # define PA_SUPPRESS_SYSTEM_EXCEPTION #endif @@ -35,13 +34,10 @@ void pa_setup_module_cells() { /// no trying to __try here [yet] try { - // init socks - pa_socks_init(); - - // init global variables + // init libraries pa_globals_init(); } catch(const Exception& e) { // global problem - SAPI::abort("setup_module_cells failed: %s", e.comment()); + SAPI::die("setup_module_cells failed: %s", e.comment()); } } @@ -50,8 +46,6 @@ void pa_destroy_module_cells() { return; pa_globals_done(); - - pa_socks_done(); } @@ -73,34 +67,18 @@ void SAPI::log(SAPI_Info& SAPI_info, con va_end(args); } -static void die_or_abort(const char* fmt, va_list args, bool write_core) { +void SAPI::die(const char* fmt, ...) { + va_list args; + va_start(args, fmt); char buf[MAX_LOG_STRING]; size_t size=vsnprintf(buf, MAX_LOG_STRING, fmt, args); size=remove_crlf(buf, buf+size); pa_ap_log_error(PA_APLOG_MARK, PA_APLOG_EMERG, 0, "%s", buf); - - // exit & try to produce core dump - if(write_core) - abort(); - else - exit(1); -} - -void SAPI::die(const char* fmt, ...) { - va_list args; - va_start(args, fmt); - die_or_abort(fmt, args, false/*write core?*/); - va_end(args); + exit(1); +// va_end(args); } -void SAPI::abort(const char* fmt, ...) { - va_list args; - va_start(args, fmt); - die_or_abort(fmt, args, true/*write core?*/); - va_end(args); -} - -char* SAPI::get_env(SAPI_Info& SAPI_info, const char* name) { +char* SAPI::Env::get(SAPI_Info& SAPI_info, const char* name) { const char* dont_return_me=pa_ap_table_get(SAPI_info.r->subprocess_env, name); return dont_return_me?pa_strdup(dont_return_me):0; } @@ -110,11 +88,13 @@ struct SAPI_environment_append_info { const char** cur; }; #endif + static const char* mk_env_pair(const char* key, const char* value) { char *result=new(PointerFreeGC) char[strlen(key)+1/*=*/+strlen(value)+1/*0*/]; strcpy(result, key); strcat(result, "="); strcat(result, value); return result; } + static int SAPI_environment_append(void *d, const char* k, const char* val) { if( k && val ) { SAPI_environment_append_info& info= @@ -123,18 +103,18 @@ static int SAPI_environment_append(void } return 1/*true*/; } -const char* const* SAPI::environment(SAPI_Info& SAPI_info) { + +const char* const* SAPI::Env::get(SAPI_Info& SAPI_info) { const pa_table *t=SAPI_info.r->subprocess_env; - const char** result=new(UseGC) const char*[pa_ap_table_size(t)+1/*0*/]; + const char** result=new const char*[pa_ap_table_size(t)+1/*0*/]; SAPI_environment_append_info info={result}; pa_ap_table_do(SAPI_environment_append, &info, t, 0); *info.cur=0; // mark EOE return result; } size_t SAPI::read_post(SAPI_Info& SAPI_info, char *buf, size_t max_bytes) { -/* pa_ap_log_error(PA_APLOG_MARK, PA_APLOG_DEBUG, SAPI_info.r->server, -"mod_parser3: SAPI::read_post(max=%u)", max_bytes); - */ +// pa_ap_log_error(PA_APLOG_MARK, PA_APLOG_DEBUG, SAPI_info.r->server, "mod_parser3: SAPI::read_post(max=%u)", max_bytes); + int retval; if((retval = pa_ap_setup_client_block(SAPI_info.r, PA_REQUEST_CHUNKED_ERROR))) return 0; @@ -157,8 +137,7 @@ size_t SAPI::read_post(SAPI_Info& SAPI_i } /// @test location provide with protocol. think about internal redirects -void SAPI::add_header_attribute(SAPI_Info& SAPI_info, - const char* dont_store_key, const char* dont_store_value) { +void SAPI::add_header_attribute(SAPI_Info& SAPI_info, const char* dont_store_key, const char* dont_store_value) { if(strcasecmp(dont_store_key, "location")==0) *SAPI_info.r->status=302; @@ -192,24 +171,16 @@ size_t SAPI::send_body(SAPI_Info& SAPI_i //@} -#if !defined(PA_DEBUG_DISABLE_GC) && !defined(WIN32) -extern long GC_large_alloc_warn_suppressed; -#endif - /** main workhorse - @todo intelligent cache-control */ static void real_parser_handler(SAPI_Info& SAPI_info, Parser_module_config *dcfg) { // collect garbage from prev request -#if !defined(PA_DEBUG_DISABLE_GC) && !defined(WIN32) - { - GC_dont_gc=0; - GC_gcollect(); - GC_dont_gc=1; - GC_large_alloc_warn_suppressed=0; - } +#ifndef PA_DEBUG_DISABLE_GC + GC_dont_gc=0; + GC_gcollect(); + GC_dont_gc=1; #endif // populate env @@ -219,15 +190,15 @@ static void real_parser_handler(SAPI_Inf // Request info Request_info request_info; memset(&request_info, 0, sizeof(request_info)); - request_info.document_root=SAPI::get_env(SAPI_info, "DOCUMENT_ROOT"); + request_info.document_root=SAPI::Env::get(SAPI_info, "DOCUMENT_ROOT"); request_info.path_translated=SAPI_info.r->filename; request_info.method=SAPI_info.r->method; request_info.query_string=SAPI_info.r->args; - request_info.uri=SAPI::get_env(SAPI_info, "REQUEST_URI"); - request_info.content_type=SAPI::get_env(SAPI_info, "CONTENT_TYPE"); - const char* content_length=SAPI::get_env(SAPI_info, "CONTENT_LENGTH"); + request_info.uri=request_info.strip_absolute_uri(SAPI::Env::get(SAPI_info, "REQUEST_URI")); + request_info.content_type=SAPI::Env::get(SAPI_info, "CONTENT_TYPE"); + const char* content_length=SAPI::Env::get(SAPI_info, "CONTENT_LENGTH"); request_info.content_length=content_length?atoi(content_length):0; - request_info.cookie=SAPI::get_env(SAPI_info, "HTTP_COOKIE"); + request_info.cookie=SAPI::Env::get(SAPI_info, "HTTP_COOKIE"); request_info.mail_received=false; // prepare to process request @@ -244,10 +215,7 @@ static void real_parser_handler(SAPI_Inf } #ifdef PA_SUPPRESS_SYSTEM_EXCEPTION -static const Exception -call_real_parser_handler__do_PEH_return_it( - SAPI_Info& SAPI_info, Parser_module_config *dcfg) -{ +static const Exception call_real_parser_handler__do_PEH_return_it(SAPI_Info& SAPI_info, Parser_module_config *dcfg) { try { real_parser_handler(SAPI_info, dcfg); } catch(const Exception& e) { @@ -256,33 +224,21 @@ call_real_parser_handler__do_PEH_return_ return Exception(); } -static void call_real_parser_handler__supress_system_exception( - SAPI_Info& SAPI_info, Parser_module_config *dcfg) -{ + +static void call_real_parser_handler__supress_system_exception(SAPI_Info& SAPI_info, Parser_module_config *dcfg) { Exception parser_exception; LPEXCEPTION_POINTERS system_exception=0; __try { - parser_exception=call_real_parser_handler__do_PEH_return_it( - SAPI_info, dcfg); - } __except ( - (system_exception=GetExceptionInformation()), - EXCEPTION_EXECUTE_HANDLER) - { - + parser_exception=call_real_parser_handler__do_PEH_return_it(SAPI_info, dcfg); + } __except ( (system_exception=GetExceptionInformation()), EXCEPTION_EXECUTE_HANDLER) { if(system_exception) if(_EXCEPTION_RECORD *er=system_exception->ExceptionRecord) - throw Exception("system", - 0, - "0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); + throw Exception("system", 0, "0x%08X at 0x%08X", er->ExceptionCode, er->ExceptionAddress); else - throw Exception("system", - 0, - ""); + throw Exception("system", 0, ""); else - throw Exception("system", - 0, - ""); + throw Exception("system", 0, ""); } if(parser_exception)