--- parser3/src/targets/cgi/parser3.C 2020/12/06 22:47:06 1.321 +++ parser3/src/targets/cgi/parser3.C 2020/12/15 20:57:56 1.331 @@ -1,11 +1,11 @@ /** @file Parser: scripting and CGI main. - Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.321 2020/12/06 22:47:06 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.331 2020/12/15 20:57:56 moko Exp $"; #include "pa_config_includes.h" @@ -21,6 +21,13 @@ volatile const char * IDENT_PARSER3_C="$ #include #include #include + +extern "C" HANDLE WINAPI GC_CreateThread(LPSECURITY_ATTRIBUTES, DWORD, LPTHREAD_START_ROUTINE, LPVOID, DWORD, LPDWORD); + +#else + +extern "C" int GC_pthread_create(pthread_t *, const pthread_attr_t *, void *(*)(void *), void * /* arg */); + #endif // defines @@ -42,15 +49,12 @@ 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** argv_extra = NULL; static char* parser3_filespec = 0; // argv[0] - -// for signal handlers -Request *request=0; +static char** argv_extra = NULL; // for error logging -static Request_info request_info; // global for correct log() reporting -static const char* filespec_4log = NULL; // never null +static THREAD_LOCAL Request_info request_info; // global for correct log() reporting +static const char* filespec_4log = NULL; // null only if system-wide auto.p used // SAPI @@ -123,7 +127,7 @@ static void log(const char* fmt, ...) { } #endif -// appends to parser3.log located next to the executable if openable, to stderr otherwize +// 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); @@ -218,20 +222,27 @@ static void SIGPIPE_handler(int /*sig*/) } #endif -// requires pa_thread_request() under Windows in pa_stat() +// requires pa_thread_request() in entry_exists() under Windows static const char *locate_config(const char *config_filespec_option, const char *executable_path){ - if(!(filespec_4log = config_filespec_option)) { + filespec_4log=config_filespec_option; + if(!filespec_4log) filespec_4log=getenv(PARSER_CONFIG_ENV_NAME); - if(!filespec_4log) - filespec_4log=getenv(REDIRECT_PREFIX PARSER_CONFIG_ENV_NAME); - if(!filespec_4log){ + if(!filespec_4log) + filespec_4log=getenv(REDIRECT_PREFIX PARSER_CONFIG_ENV_NAME); + if(!filespec_4log){ // next to the executable char *beside_executable_path = pa_strdup(executable_path); bool stripped_filename = rsplit(beside_executable_path, '/') || rsplit(beside_executable_path, '\\'); filespec_4log = pa_strcat(stripped_filename ? beside_executable_path : "." /* no path, just filename */ , "/" AUTO_FILE_NAME); - if(!entry_exists(filespec_4log)) - return NULL; - } + if(entry_exists(filespec_4log)) + return filespec_4log; +#ifdef SYSTEM_CONFIG_FILE + if(entry_exists(SYSTEM_CONFIG_FILE)){ + filespec_4log=NULL; + return SYSTEM_CONFIG_FILE; + } +#endif + return NULL; } return filespec_4log; } @@ -294,71 +305,122 @@ static void config_handler(SAPI_Info &in request_info.argv = argv_extra; // prepare to process request - Request request(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); - { - // initing ::request ptr for signal handlers - RequestController rc(&request); - // only once - config_filespec = locate_config(config_filespec, parser3_filespec); - // process main auto.p only - request.core(config_filespec, false, String::Empty); - // clearing ::request in RequestController desctructor to prevent signal handlers from accessing invalid memory - } + Request r(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); + // only once + config_filespec = locate_config(config_filespec, parser3_filespec); + // process main auto.p only + r.core(config_filespec, false, String::Empty); } static void connection_handler(SAPI_Info_HTTPD &info, HTTPD_Connection &connection) { - connection.read_header(); - info.populate_env(); + try { + memset(&request_info, 0, sizeof(request_info)); - char document_root_buf[MAX_STRING]; - full_disk_path("", document_root_buf, sizeof(document_root_buf)); + connection.read_header(); + info.populate_env(); - 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(); - request_info.query_string = connection.query(); - request_info.uri = request_info.strip_absolute_uri(connection.uri()); - request_info.content_type = connection.content_type(); - request_info.content_length = connection.content_length(); - request_info.cookie = info.get_env("HTTP_COOKIE"); - request_info.mail_received = false; - request_info.argv = argv_extra; + char document_root_buf[MAX_STRING]; + full_disk_path("", document_root_buf, sizeof(document_root_buf)); - // prepare to process request - Request request(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); - { - // initing ::request ptr for signal handlers - RequestController rc(&request); + request_info.document_root = document_root_buf; + request_info.path_translated = filespec_to_process; + request_info.method = connection.method(); + request_info.query_string = connection.query(); + request_info.uri = request_info.strip_absolute_uri(connection.uri()); + request_info.content_type = connection.content_type(); + request_info.content_length = (size_t)connection.content_length(); + request_info.cookie = info.get_env("HTTP_COOKIE"); + request_info.mail_received = false; + request_info.argv = argv_extra; + + // prepare to process request + Request r(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); // process the request - request.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0, String("httpd-main")); - // clearing ::request in RequestController desctructor to prevent signal handlers from accessing invalid memory + r.core(config_filespec, strcasecmp(request_info.method, "HEAD")==0, String("httpd-main")); + } 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())); + } +} + +#ifdef _MSC_VER +DWORD WINAPI connection_thread(void *arg){ +#else +static void *connection_thread(void *arg){ +#endif + HTTPD_Connection &connection=*(HTTPD_Connection*)arg; + SAPI_Info_HTTPD info(connection); + + try { + connection_handler(info, connection); + } catch(const Exception& e) { // exception in send_error + SAPI::log(*sapiInfo, "%s", e.comment()); } + + delete(&connection); + return 0; } static void httpd_mode() { + config_handler(*sapiInfo); + int sock = HTTPD_Server::bind(httpd_host_port); - config_handler(*sapiInfo); +#ifdef SIGCHLD + signal(SIGCHLD, SIG_IGN); +#endif +#ifdef SIGPIPE + signal(SIGPIPE, SIG_IGN); +#endif while(1){ +#ifndef _MSC_VER + 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; - SAPI_Info_HTTPD info(connection); + switch (HTTPD_Server::mode) { + case HTTPD_Server::MULTITHREADED: +#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; + break; +#else + pthread_t thread; + pthread_attr_t attr; + pthread_attr_init(&attr); + pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); + + 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; + break; + case HTTPD_Server::PARALLEL: + pid=fork(); + if(pid<0) + throw Exception("httpd.fork", 0, "fork failed: %s (%d)", strerror(errno), errno); + if(pid>0) + continue; // parent should close connection.sock as well +#endif + case HTTPD_Server::SEQUENTIAL: // and fork child - try { // connection try - connection_handler(info, connection); - } 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())); + SAPI_Info_HTTPD info(connection); + connection_handler(info, connection); } // closing connection socket in HTTPD_Connection destructor } catch(const Exception& e) { // exception in accept or send_error SAPI::log(*sapiInfo, "%s", e.comment()); } + +#ifndef _MSC_VER + if(pid==0) // fork child + exit(0); +#endif } } @@ -435,7 +497,7 @@ static void real_parser_handler(bool cgi } request_info.content_type = getenv("CONTENT_TYPE"); - request_info.content_length = pa_atoul(getenv("CONTENT_LENGTH")); + request_info.content_length = (size_t)pa_atoul(getenv("CONTENT_LENGTH")); request_info.cookie = getenv("HTTP_COOKIE"); request_info.mail_received = mail_received; @@ -446,12 +508,12 @@ static void real_parser_handler(bool cgi #endif // prepare to process request - Request request(*sapiInfo, request_info, cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS); + Request r(*sapiInfo, request_info, cgi ? String::Language(String::L_HTML|String::L_OPTIMIZE_BIT) : String::L_AS_IS); { // initing ::request ptr for signal handlers - RequestController rc(&request); + RequestController rc(&r); // process the request - request.core(locate_config(config_filespec, parser3_filespec), strcasecmp(request_info.method, "HEAD")==0); + r.core(locate_config(config_filespec, parser3_filespec), strcasecmp(request_info.method, "HEAD")==0); // clearing ::request in RequestController destructor to prevent signal handlers from accessing invalid memory } @@ -498,7 +560,7 @@ static void call_real_parser_handler__su static void usage(const char* program) { printf( "Parser/%s\n" - "Copyright (c) 2001-2017 Art. Lebedev Studio (http://www.artlebedev.com)\n" + "Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com)\n" "Author: Alexandr Petrosian (http://paf.design.ru)\n" "\n" "Usage: %s [options] [file]\n" @@ -528,12 +590,10 @@ int main(int argc, char *argv[]) { sapiInfo = cgi ? new SAPI_Info_CGI() : new SAPI_Info(); #ifdef SIGUSR1 - if(signal(SIGUSR1, SIGUSR1_handler)==SIG_ERR) - SAPI::die("Can not set handler for SIGUSR1"); + signal(SIGUSR1, SIGUSR1_handler); #endif #ifdef SIGPIPE - if(signal(SIGPIPE, SIGPIPE_handler)==SIG_ERR) - SAPI::die("Can not set handler for SIGPIPE"); + signal(SIGPIPE, SIGPIPE_handler); #endif char *raw_filespec_to_process = NULL;