--- parser3/src/targets/cgi/parser3.C 2026/10/10 02:01:15 1.378 +++ parser3/src/targets/cgi/parser3.C 2026/10/18 21:16:41 1.381 @@ -5,7 +5,7 @@ Authors: Konstantin Morshnev , Alexandr Petrosian */ -volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.378 2026/10/10 02:01:15 moko Exp $"; +volatile const char * IDENT_PARSER3_C="$Id: parser3.C,v 1.381 2026/10/18 21:16:41 moko Exp $"; #include "pa_config_includes.h" @@ -18,6 +18,7 @@ volatile const char * IDENT_PARSER3_C="$ #include "pa_vconsole.h" #include "pa_sapi_info.h" #include "pa_code_cache.h" +#include "pa_websocket.h" #ifdef _MSC_VER #include @@ -70,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, '/')){ @@ -99,14 +100,20 @@ static void pa_log(const char* fmt, va_l // prefix time_t t=time(0); - if(const char* stamp=ctime(&t)) { // never saw that +#ifdef _MSC_VER + const char* stamp=ctime(&t); // the buffer is per thread +#else + char stamp_buffer[32]; // the buffer of ctime() is shared by the threads + const char* stamp=ctime_r(&t, stamp_buffer); +#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() ); } // message char buf[MAX_LOG_STRING]; - size_t size=vsnprintf(buf, MAX_LOG_STRING, fmt, args); + size_t size=pa_vsnprintf(buf, MAX_LOG_STRING, fmt, args); size=remove_crlf(buf, buf+size); fwrite(buf, size, 1, f); @@ -147,7 +154,7 @@ void SAPI::die(const char* fmt, ...) { // 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); @@ -358,6 +365,8 @@ static void connection_handler(SAPI_Info // prepare to process request Request r(info, request_info, String::Language(String::L_HTML|String::L_OPTIMIZE_BIT)); + WebSocket websocket(connection); + r.websocket=&websocket; // process the request r.core(config_filespec, main_method_name, &httpd_class_name); } catch(const Exception& e) { // exception in connection handling