--- parser3/src/targets/cgi/parser3.C 2020/12/15 20:57:56 1.331 +++ parser3/src/targets/cgi/parser3.C 2020/12/31 19:48:47 1.342 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.331 2020/12/15 20:57:56 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.342 2020/12/31 19:48:47 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" @@ -53,12 +54,12 @@ static char* parser3_filespec = 0; // ar static char** argv_extra = NULL; // for error logging -static THREAD_LOCAL Request_info request_info; // global for correct log() reporting +static THREAD_LOCAL Request_info *request_info_4log = NULL; // global for correct log() reporting static const char* filespec_4log = NULL; // null only if system-wide auto.p used // SAPI -static void log(const char* fmt, va_list args) { +static void pa_log(const char* fmt, va_list args) { bool opened=false; FILE *f=0; @@ -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 @@ -107,8 +108,8 @@ static void log(const char* fmt, va_list size=remove_crlf(buf, buf+size); fwrite(buf, size, 1, f); - if(request_info.method) { - fprintf(f, " [uri=%s, method=%s, cl=%lu]\n", request_info.uri ? request_info.uri : "", request_info.method, (unsigned long)request_info.content_length); + if(request_info_4log && request_info_4log->method) { + fprintf(f, " [uri=%s, method=%s, cl=%lu]\n", request_info_4log->uri ? request_info_4log->uri : "", request_info_4log->method, (unsigned long)request_info_4log->content_length); } else fputs(" [no request info]\n", f); @@ -118,20 +119,18 @@ static void log(const char* fmt, va_list fflush(f); } -#ifdef PA_DEBUG_CGI_ENTRY_EXIT -static void log(const char* fmt, ...) { +void pa_log(const char* fmt, ...) { va_list args; va_start(args,fmt); - log(fmt, args); + pa_log(fmt, args); va_end(args); } -#endif // appends to parser3.log located next to the config file if openable, to stderr otherwize void SAPI::log(SAPI_Info&, const char* fmt, ...) { va_list args; va_start(args,fmt); - ::log(fmt, args); + pa_log(fmt, args); va_end(args); } @@ -140,7 +139,7 @@ void SAPI::die(const char* fmt, ...) { // logging first, first vsnprintf va_start(args,fmt); - ::log(fmt, args); + pa_log(fmt, args); va_end(args); // inform user, second vsnprintf @@ -201,12 +200,6 @@ static void log_signal(const char* signa SAPI::log(*sapiInfo, "%s received %s processing request", signal_name, request ? "while" : "before or after"); } -#ifdef SIGUSR1 -static void SIGUSR1_handler(int /*sig*/){ - log_signal("SIGUSR1"); -} -#endif - #ifdef SIGPIPE #define SIGPIPE_NAME "SIGPIPE" static const String sigpipe_name(SIGPIPE_NAME); @@ -281,25 +274,40 @@ const char* maybe_reconstruct_IIS_status } #define MAYBE_RECONSTRUCT_IIS_STATUS_IN_QS(s) maybe_reconstruct_IIS_status_in_qs(s) -#else +#else #define MAYBE_RECONSTRUCT_IIS_STATUS_IN_QS(s) s #endif - class RequestController { public: RequestController(Request* r){ - ::request=r; + request=r; } ~RequestController(){ - ::request=0; + request=0; + } +}; + +class RequestInfoController { +public: + RequestInfoController(Request_info* rinfo){ + request_info_4log=rinfo; + } + ~RequestInfoController(){ + request_info_4log=0; } }; +/** httpd support */ +static const String httpd_class_name("httpd"); + static void config_handler(SAPI_Info &info) { char document_root_buf[MAX_STRING]; full_disk_path("", document_root_buf, sizeof(document_root_buf)); + Request_info request_info; + RequestInfoController ric(&request_info); + request_info.document_root = document_root_buf; request_info.uri = ""; request_info.argv = argv_extra; @@ -313,10 +321,12 @@ static void config_handler(SAPI_Info &in } static void connection_handler(SAPI_Info_HTTPD &info, HTTPD_Connection &connection) { - try { - memset(&request_info, 0, sizeof(request_info)); + Request_info request_info; + RequestInfoController ric(&request_info); - connection.read_header(); + try { + if(!connection.read_header()) + return; // ignore "void" connections info.populate_env(); char document_root_buf[MAX_STRING]; @@ -336,10 +346,14 @@ static void connection_handler(SAPI_Info // prepare to process request Request r(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); // process the request - r.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0, String("httpd-main")); + r.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0, main_method_name, &httpd_class_name); } catch(const Exception& e) { // exception in connection handling or unhandled exception SAPI::log(info, "%s", e.comment()); - SAPI::send_error(info, e.comment(), info.exception_http_status(e.type())); + const char *status = info.exception_http_status(e.type()); + if(*status){ + info.clear_response_headers(); + SAPI::send_error(info, e.comment(), status); + } } } @@ -378,7 +392,6 @@ 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; @@ -391,6 +404,7 @@ static void httpd_mode() { connection.sock = -1; break; #else +#ifdef HAVE_TLS pthread_t thread; pthread_attr_t attr; pthread_attr_init(&attr); @@ -400,6 +414,7 @@ static void httpd_mode() { throw Exception("httpd.fork", 0, "thread creation failed (%d)", result); connection.sock=-1; break; +#endif case HTTPD_Server::PARALLEL: pid=fork(); if(pid<0) @@ -442,6 +457,9 @@ static void real_parser_handler(bool cgi char document_root_buf[MAX_STRING]; // global request info + Request_info request_info; + RequestInfoController ric(&request_info); + request_info.path_translated = filespec_to_process; request_info.method = request_method ? request_method : "GET"; request_info.query_string = MAYBE_RECONSTRUCT_IIS_STATUS_IN_QS(getenv("QUERY_STRING")); @@ -589,9 +607,6 @@ int main(int argc, char *argv[]) { bool cgi=(getenv("SERVER_SOFTWARE") || getenv("SERVER_NAME") || getenv("GATEWAY_INTERFACE") || getenv("REQUEST_METHOD")) && !getenv("PARSER_VERSION"); sapiInfo = cgi ? new SAPI_Info_CGI() : new SAPI_Info(); -#ifdef SIGUSR1 - signal(SIGUSR1, SIGUSR1_handler); -#endif #ifdef SIGPIPE signal(SIGPIPE, SIGPIPE_handler); #endif