--- parser3/src/targets/cgi/parser3.C 2020/12/25 14:32:44 1.341 +++ parser3/src/targets/cgi/parser3.C 2022/09/21 20:26:08 1.349 @@ -5,7 +5,7 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.341 2020/12/25 14:32:44 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.349 2022/09/21 20:26:08 moko Exp $"; #include "pa_config_includes.h" @@ -50,7 +50,7 @@ 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 @@ -77,7 +77,7 @@ static void pa_log(const char* fmt, va_l 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, "."); @@ -186,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); @@ -274,11 +274,10 @@ 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){ @@ -299,6 +298,9 @@ public: } }; +/** 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)); @@ -344,7 +346,7 @@ 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()); const char *status = info.exception_http_status(e.type()); @@ -376,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 @@ -388,10 +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 { HTTPD_Connection connection; - if(!connection.accept(sock, 5)) + if(!connection.accept(sock, 500)) continue; switch (HTTPD_Server::mode) { @@ -399,7 +400,7 @@ 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 @@ -410,7 +411,7 @@ 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: @@ -466,14 +467,14 @@ static void real_parser_handler(bool cgi // obligatory const char* path_info=getenv("PATH_INFO"); if(!path_info) - SAPI::die("CGI: illegal call (missing PATH_INFO)"); + SAPI::die("parser3: illegal CGI call (missing PATH_INFO)"); request_info.document_root = getenv("DOCUMENT_ROOT"); if(!request_info.document_root) { // IIS or fcgiwrap minimalistic setup ssize_t prefix_len = strlen(filespec_to_process) - strlen(path_info); if(prefix_len < 0 || strcmp(filespec_to_process + prefix_len, path_info) != 0) - SAPI::die("CGI: illegal call (invalid PATH_INFO in reinventing DOCUMENT_ROOT)"); + SAPI::die("parser3: illegal CGI call (invalid PATH_INFO in reinventing DOCUMENT_ROOT)"); char* document_root = new(PointerFreeGC) char[prefix_len + 1/*0*/]; memcpy(document_root, filespec_to_process, prefix_len); document_root[prefix_len] = 0; @@ -485,7 +486,7 @@ static void real_parser_handler(bool cgi // another obligatory const char* script_name = getenv("SCRIPT_NAME"); if(!script_name) - SAPI::die("CGI: illegal call (missing SCRIPT_NAME)"); + SAPI::die("parser3: illegal CGI call (missing SCRIPT_NAME)"); /* http://parser3/env.html?123 =OK $request:uri=/env.html?123 @@ -502,7 +503,7 @@ static void real_parser_handler(bool cgi size_t script_name_len = strlen(script_name); size_t uri_len = strlen(request_info.uri); if(strncmp(request_info.uri, script_name, script_name_len)==0 && script_name_len != uri_len) // under IIS they are the same - SAPI::die("CGI: illegal call (1)"); + SAPI::die("parser3: illegal CGI call (REQUEST_URI starts with SCRIPT_NAME)"); } else { // fcgiwrap minimalistic setup request_info.uri = request_info.query_string && *request_info.query_string ? pa_strcat(path_info, "?", request_info.query_string) : path_info; } @@ -513,7 +514,7 @@ static void real_parser_handler(bool cgi } request_info.content_type = getenv("CONTENT_TYPE"); - request_info.content_length = (size_t)pa_atoul(getenv("CONTENT_LENGTH")); + request_info.content_length = cgi ? (size_t)pa_atoul(getenv("CONTENT_LENGTH")) : 0; // only SAPI_Info_CGI can read POST request_info.cookie = getenv("HTTP_COOKIE"); request_info.mail_received = mail_received; @@ -598,7 +599,7 @@ 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? @@ -624,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){ @@ -644,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; } } @@ -654,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;