--- parser3/src/targets/apache/mod_parser3_core.C 2015/04/02 22:04:41 1.11 +++ parser3/src/targets/apache/mod_parser3_core.C 2017/02/07 22:00:45 1.16 @@ -1,11 +1,11 @@ /** @file 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.11 2015/04/02 22:04:41 moko Exp $"; +volatile const char * IDENT_MOD_PARSER3_CORE_C="$Id: mod_parser3_core.C,v 1.16 2017/02/07 22:00:45 moko Exp $"; #include "pa_config_includes.h" @@ -125,7 +125,7 @@ static int SAPI_environment_append(void } 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; @@ -225,7 +225,7 @@ static void real_parser_handler(SAPI_Inf 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::Env::get(SAPI_info, "REQUEST_URI"); + 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;