--- parser3/src/targets/cgi/parser3.C 2020/12/15 20:57:56 1.331 +++ parser3/src/targets/cgi/parser3.C 2022/01/26 17:04:46 1.347 @@ -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.347 2022/01/26 17:04:46 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" @@ -49,16 +50,16 @@ static const char* filespec_to_process = static const char* httpd_host_port = 0; // -p option static const char* config_filespec = 0; // -f option or from env or next to the executable if exists static bool mail_received = false; // -m option? [asked to parse incoming message to $mail:received] -static char* parser3_filespec = 0; // argv[0] +static const char* parser3_filespec = 0; // argv[0] 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; @@ -76,7 +77,7 @@ static void log(const char* fmt, va_list if(!opened && filespec_4log) { char beside_config_path[MAX_STRING]; - strncpy(beside_config_path, filespec_4log, MAX_STRING-1); beside_config_path[MAX_STRING-1]=0; + pa_strncpy(beside_config_path, filespec_4log, MAX_STRING); if(!(rsplit(beside_config_path, '/') || rsplit(beside_config_path, '\\'))) { // strip filename // no path, just filename strcpy(beside_config_path, "."); @@ -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 @@ -187,7 +186,7 @@ static void full_disk_path(const char* f || file_name[0] && file_name[1]==':' #endif ){ - strncpy(buf, file_name, buf_size-1); buf[buf_size-1]=0; + pa_strncpy(buf, file_name, buf_size); } else { char cwd[MAX_STRING]; snprintf(buf, buf_size, "%s/%s", getcwd(cwd, MAX_STRING) ? cwd : "", file_name); @@ -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); + } } } @@ -364,11 +378,8 @@ static void *connection_thread(void *arg static void httpd_mode() { config_handler(*sapiInfo); - int sock = HTTPD_Server::bind(httpd_host_port); + SOCKET sock = HTTPD_Server::bind(httpd_host_port); -#ifdef SIGCHLD - signal(SIGCHLD, SIG_IGN); -#endif #ifdef SIGPIPE signal(SIGPIPE, SIG_IGN); #endif @@ -376,11 +387,12 @@ static void httpd_mode() { while(1){ #ifndef _MSC_VER pid_t pid=1; + if(HTTPD_Server::mode == HTTPD_Server::PARALLEL) + while (waitpid((pid_t)(-1), 0, WNOHANG) > 0); #endif try { - request_info.method=NULL; // wipe previous request for correct logging HTTPD_Connection connection; - if(!connection.accept(sock, 5)) + if(!connection.accept(sock, 500)) continue; switch (HTTPD_Server::mode) { @@ -388,9 +400,10 @@ static void httpd_mode() { #ifdef _MSC_VER if (!GC_CreateThread(0, 0, connection_thread, new HTTPD_Connection(connection), 0, 0)) throw Exception("httpd.fork", 0, "thread creation failed"); - connection.sock = -1; + connection.sock=INVALID_SOCKET; break; #else +#ifdef HAVE_TLS pthread_t thread; pthread_attr_t attr; pthread_attr_init(&attr); @@ -398,8 +411,9 @@ static void httpd_mode() { if(int result=GC_pthread_create(&thread, &attr, connection_thread, new HTTPD_Connection(connection))) throw Exception("httpd.fork", 0, "thread creation failed (%d)", result); - connection.sock=-1; + connection.sock=INVALID_SOCKET; break; +#endif case HTTPD_Server::PARALLEL: pid=fork(); if(pid<0) @@ -442,6 +456,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")); @@ -582,16 +599,13 @@ int main(int argc, char *argv[]) { log("main: entry"); #endif - parser3_filespec = argv[0]; + parser3_filespec = argc ? argv[0] : "parser3"; umask(2); // were we started as CGI? 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 @@ -611,7 +625,7 @@ int main(int argc, char *argv[]) { char c = carg[k]; switch (c) { case 'h': - usage(argv[0]); + usage(parser3_filespec); break; case 'f': if(optind < argc - 1){ @@ -631,8 +645,8 @@ int main(int argc, char *argv[]) { break; #endif default: - fprintf(stderr, "%s: invalid option '%c'\n", argv[0], c); - usage(argv[0]); + fprintf(stderr, "%s: invalid option '%c'\n", parser3_filespec, c); + usage(parser3_filespec); break; } } @@ -641,16 +655,16 @@ int main(int argc, char *argv[]) { if (optind > argc - 1) { if(!httpd_host_port) { - fprintf(stderr, "%s: file not specified\n", argv[0]); - usage(argv[0]); + fprintf(stderr, "%s: file not specified\n", parser3_filespec); + usage(parser3_filespec); } } else { raw_filespec_to_process=argv[optind]; } if (httpd_host_port && mail_received) { - fprintf(stderr, "%s: -p and -m options should not be used together\n", argv[0]); - usage(argv[0]); + fprintf(stderr, "%s: -p and -m options should not be used together\n", parser3_filespec); + usage(parser3_filespec); } argv_extra=argv + optind;