--- parser3/src/targets/cgi/parser3.C 2026/10/16 13:55:16 1.379 +++ parser3/src/targets/cgi/parser3.C 2026/10/26 22:41:38 1.385 @@ -5,7 +5,7 @@ Authors: Konstantin Morshnev , Alexandr Petrosian */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.379 2026/10/16 13:55:16 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.385 2026/10/26 22:41:38 moko Exp $"; #include "pa_config_includes.h" @@ -71,7 +71,7 @@ const char *parser3_log_filespec() { // const char* slog=log_filespec; if(!slog) { - static char log_spec[MAX_STRING + 12 /* '/parser3.log' */]; + static THREAD_LOCAL char log_spec[MAX_STRING + 12 /* '/parser3.log' */]; pa_strncpy(log_spec, filespec_4log, MAX_STRING); if(char* log_dir_pos=strrchr(log_spec, '/')){ @@ -87,45 +87,57 @@ const char *parser3_log_filespec() { // // SAPI -static void pa_log(const char* fmt, va_list args) { - // use no memory [so that we could log out-of-memory error] - const char* slog=parser3_log_filespec(); - FILE *f=strcmp(slog,"-") ? fopen(slog, "at") : stderr; - - // fallback to stderr - if(!f) - f=stderr; +#ifndef O_CLOEXEC +#define O_CLOEXEC 0 +#endif +#ifndef STDERR_FILENO +#define STDERR_FILENO 2 +#endif - setbuf(f, 0); // stderr stream is unbuffered by default, but still... +static void pa_log(const char* stamp, const char* fmt, va_list args) { + // use no memory (to log out-of-memory error): the line is built on the stack and written at once + char line[64 + MAX_LOG_STRING + 1024 + 32 + 100]; // prefix + message + request info suffix: uri + method and the rest of it + size_t size=0; // prefix - time_t t=time(0); - if(const char* stamp=ctime(&t)) { // never saw that +#ifndef _MSC_VER + char stamp_buffer[32]; +#endif + if(!stamp){ + time_t t=time(0); +#ifdef _MSC_VER + stamp=ctime(&t); // the buffer is per thread +#else + stamp=ctime_r(&t, stamp_buffer); // the buffer of ctime() is shared by the threads +#endif + } + if(stamp) { // never saw that if(size_t len=strlen(stamp)) // saw once stamp being ="" - fprintf(f, "[%.*s] [%u] ", (int)len-1, stamp, (unsigned int)pa_get_thread_id() ); + size=pa_snprintf(line, 64, "[%.*s] [%u] ", (int)len-1 /* exclude \n */, stamp, (unsigned int)pa_get_thread_id() ); } // message - char buf[MAX_LOG_STRING]; - size_t size=vsnprintf(buf, MAX_LOG_STRING, fmt, args); - size=remove_crlf(buf, buf+size); - fwrite(buf, size, 1, f); - - 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); + size+=remove_crlf(line+size, line+size+pa_vsnprintf(line+size, MAX_LOG_STRING, fmt, args)); - if(f!=stderr) - fclose(f); + // suffix + if(request_info_4log && request_info_4log->method) + size+=pa_snprintf(line+size, sizeof(line)-size, " [uri=%.1024s, method=%.32s, cl=%lu]\n", request_info_4log->uri ? request_info_4log->uri : "", request_info_4log->method, (unsigned long)request_info_4log->content_length); else - fflush(f); + size+=pa_snprintf(line+size, sizeof(line)-size, " [no request info]\n"); + + const char* slog=parser3_log_filespec(); + int fd=strcmp(slog,"-") ? pa_open(slog, O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0666) : -1; + if(fd<0) + fd=STDERR_FILENO; // fallback to stderr + PA_UNUSED int ignore_result=write(fd, line, (unsigned int)size); + if(fd!=STDERR_FILENO) + close(fd); } void pa_log(const char* fmt, ...) { va_list args; va_start(args,fmt); - pa_log(fmt, args); + pa_log(0, fmt, args); va_end(args); } @@ -133,7 +145,7 @@ void pa_log(const char* fmt, ...) { void SAPI::log(SAPI_Info&, const char* fmt, ...) { va_list args; va_start(args,fmt); - pa_log(fmt, args); + pa_log(0, fmt, args); va_end(args); } @@ -142,13 +154,13 @@ void SAPI::die(const char* fmt, ...) { // logging first, first vsnprintf va_start(args,fmt); - pa_log(fmt, args); + pa_log(0, fmt, args); va_end(args); // inform user, second vsnprintf va_start(args, fmt); char message[MAX_STRING]; - vsnprintf(message, MAX_STRING, fmt, args); + pa_vsnprintf(message, MAX_STRING, fmt, args); SAPI::send_error(sapi_info_4log ? *sapi_info_4log : *sapi_info, message); exit(1); @@ -376,6 +388,8 @@ DWORD WINAPI connection_thread(void *arg #else static void *connection_thread(void *arg){ #endif + Temp_gc_references gc_references; // for pointers GC does not see, the very start of the thread + HTTPD_Connection &connection=*(HTTPD_Connection*)arg; SAPI_Info_HTTPD info(connection); @@ -389,6 +403,22 @@ static void *connection_thread(void *arg return 0; } +static void reject_connection(HTTPD_Connection &connection) { + // main thread only + static unsigned long total=0; + static time_t logged=0; + + total++; + time_t now=time(0); + if(now!=logged){ // not more than once a second + logged=now; + pa_log("max-connections limit %d reached, rejecting connection from %s (%lu rejected in total)", HTTPD_Server::max_connections, connection.remote_addr, total); + } + + SAPI_Info_HTTPD info(connection); + SAPI::send_error(info, "too many connections", "503"); +} + static void httpd_mode() { config_handler(*sapi_info); @@ -401,20 +431,29 @@ 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, 500)) + bool accepted=connection.accept(sock, 500); +#ifndef _MSC_VER + if(HTTPD_Server::mode == HTTPD_Server::PARALLEL) + while (waitpid((pid_t)(-1), 0, WNOHANG) > 0) + HTTPD_Server::track_connection(-1); // the child has exited, some of them while we were waiting +#endif + if(!accepted) + continue; + + if(HTTPD_Server::too_many_connections()){ + reject_connection(connection); // no thread or process is started continue; + } 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=INVALID_SOCKET; + connection.sock=INVALID_SOCKET; // thread owns the connection now break; #else #ifdef HAVE_TLS @@ -425,22 +464,25 @@ 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=INVALID_SOCKET; + connection.sock=INVALID_SOCKET; // thread owns the connection now break; #endif 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 + if(pid>0){ + closesocket(connection.sock); // parent should close connection.sock as well + connection.sock=INVALID_SOCKET; // child owns the connection now + continue; + } #endif case HTTPD_Server::SEQUENTIAL: // and fork child SAPI_Info_HTTPD info(connection); connection_handler(info, connection); } - // closing connection socket in HTTPD_Connection destructor + // SEQUENTIAL or error: closing connection socket in HTTPD_Connection destructor } catch(const Exception& e) { // exception in accept or send_error pa_log("%s", e.comment()); } @@ -618,6 +660,8 @@ static void usage(const char* message=NU } int main(int argc, char *argv[]) { + Temp_gc_references gc_references; // for pointers GC does not see + #ifdef PA_DEBUG_CGI_ENTRY_EXIT pa_log("main: entry"); #endif @@ -698,7 +742,7 @@ int main(int argc, char *argv[]) { log_filespec=getenv(PARSER_LOG_ENV_NAME); if(!log_filespec) log_filespec=getenv(REDIRECT_PREFIX PARSER_LOG_ENV_NAME); - if(log_filespec) + if(log_filespec && strcmp(log_filespec, "-")) // "-" is stderr log_filespec=full_disk_path(log_filespec); #ifdef _MSC_VER