--- parser3/src/targets/apache/mod_parser3_core.C 2020/10/12 22:02:33 1.25 +++ parser3/src/targets/apache/mod_parser3_core.C 2020/10/26 23:15:51 1.28 @@ -5,7 +5,7 @@ Parser: apache 1.3/2.X module, part, com Author: Alexandr Petrosian (http://paf.design.ru) */ -volatile const char * IDENT_MOD_PARSER3_CORE_C="$Id: mod_parser3_core.C,v 1.25 2020/10/12 22:02:33 moko Exp $"; +volatile const char * IDENT_MOD_PARSER3_CORE_C="$Id: mod_parser3_core.C,v 1.28 2020/10/26 23:15:51 moko Exp $"; #include "pa_config_includes.h" @@ -83,6 +83,10 @@ char* SAPI::Env::get(SAPI_Info& SAPI_inf return dont_return_me?pa_strdup(dont_return_me):0; } +bool SAPI::Env::set(SAPI_Info&, const char*, const char*) { + return false; +} + #ifndef DOXYGEN struct SAPI_environment_append_info { const char** cur; @@ -96,9 +100,8 @@ static const char* mk_env_pair(const cha } static int SAPI_environment_append(void *d, const char* k, const char* val) { - if( k && val ) { - SAPI_environment_append_info& info= - *static_cast(d); + if(k && val) { + SAPI_environment_append_info& info=*static_cast(d); *info.cur++=mk_env_pair(k, val); } return 1/*true*/; @@ -196,7 +199,7 @@ static void real_parser_handler(SAPI_Inf request_info.query_string=SAPI_info.r->args; 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"); - request_info.content_length=pa_atoui(SAPI::Env::get(SAPI_info, "CONTENT_LENGTH"), 10); + request_info.content_length=pa_atoul(SAPI::Env::get(SAPI_info, "CONTENT_LENGTH")); request_info.cookie=SAPI::Env::get(SAPI_info, "HTTP_COOKIE"); request_info.mail_received=false; @@ -265,19 +268,7 @@ int pa_parser_handler(pa_request_rec *r, } catch(const Exception& e) { // exception in unhandled exception // log it SAPI::log(SAPI_info, "%s", e.comment()); - - // prepare header - // capitalized headers are used for preventing malloc during capitalization - SAPI::add_header_attribute(SAPI_info, HTTP_CONTENT_TYPE_CAPITALIZED, "text/plain"); - - // send header - SAPI::send_header(SAPI_info); - - // send body - if(!r->header_only) - SAPI::send_body(SAPI_info, e.comment(), strlen(e.comment())); - - // unsuccessful finish + SAPI::send_error(SAPI_info, e.comment()); } /*