--- parser3/src/targets/cgi/parser3.C 2020/12/15 17:23:56 1.330 +++ parser3/src/targets/cgi/parser3.C 2020/12/16 11:04:22 1.333 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.330 2020/12/15 17:23:56 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.333 2020/12/16 11:04:22 moko Exp $"; #include "pa_config_includes.h" @@ -14,6 +14,7 @@ volatile const char * IDENT_PARSER3_C="$ #include "pa_common.h" #include "pa_request.h" #include "pa_version.h" +#include "pa_threads.h" #include "pa_vconsole.h" #include "pa_sapi_info.h" @@ -98,7 +99,7 @@ static void log(const char* fmt, va_list time_t t=time(0); if(const char* stamp=ctime(&t)) { // never saw that if(size_t len=strlen(stamp)) // saw once stamp being ="" - fprintf(f, "[%.*s] [%u] ", (int)len-1, stamp, (unsigned int)getpid() ); + fprintf(f, "[%.*s] [%u] ", (int)len-1, stamp, (unsigned int)pa_get_thread_id() ); } // message @@ -314,13 +315,15 @@ static void config_handler(SAPI_Info &in static void connection_handler(SAPI_Info_HTTPD &info, HTTPD_Connection &connection) { try { - connection.read_header(); + memset(&request_info, 0, sizeof(request_info)); + + if(connection.read_header()) + return; // ignore "void" connections info.populate_env(); char document_root_buf[MAX_STRING]; full_disk_path("", document_root_buf, sizeof(document_root_buf)); - memset(&request_info, 0, sizeof(request_info)); request_info.document_root = document_root_buf; request_info.path_translated = filespec_to_process; request_info.method = connection.method(); @@ -377,6 +380,7 @@ static void httpd_mode() { pid_t pid=1; #endif try { + request_info.method=NULL; // wipe previous request for correct logging HTTPD_Connection connection; if(!connection.accept(sock, 5)) continue;