From: Bill Stoddard Date: Mon, 23 Jun 2003 13:15:21 +0000 (+0000) Subject: Fix some broken log messages in WinNT MPM. X-Git-Tag: 2.0.47~42 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99ebe7362786d79e0846be696eaeeacbd984510c;p=thirdparty%2Fapache%2Fhttpd.git Fix some broken log messages in WinNT MPM. Submitted by: Juan Rivera git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@100341 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 3fad7c6cd96..4d14eba7b00 100644 --- a/STATUS +++ b/STATUS @@ -1,5 +1,5 @@ APACHE 2.0 STATUS: -*-text-*- -Last modified at [$Date: 2003/06/23 13:07:19 $] +Last modified at [$Date: 2003/06/23 13:15:20 $] Release: @@ -213,10 +213,6 @@ PATCHES TO PORT FROM 2.1 modules/dav/main/mod_dav.h 1.67 +1: striker, gstein - * winnt MPM: fix some invalid ap_log_error() invocations - server/mpm/winnt/child.c 1.15 - +1: trawick, wrowe, brianp, stoddard - * handle switching between libtools and unwritable ltconfig/ltmain.sh buildconf 1.36, 1.37 build/.cvsignore 1.4 diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c index 5ca5f7ca4f0..d890db860db 100644 --- a/server/mpm/winnt/child.c +++ b/server/mpm/winnt/child.c @@ -875,7 +875,7 @@ void child_main(apr_pool_t *pconf) ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), ap_server_conf, "Child %d: _beginthreadex failed. Unable to create all worker threads. " "Created %d of the %d threads requested with the ThreadsPerChild configuration directive.", - threads_created, ap_threads_per_child); + my_pid, threads_created, ap_threads_per_child); ap_signal_parent(SIGNAL_PARENT_SHUTDOWN); goto shutdown; } @@ -942,7 +942,7 @@ void child_main(apr_pool_t *pconf) if (rv == WAIT_FAILED) { /* Something serious is wrong */ ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), ap_server_conf, - "Child %d: WAIT_FAILED -- shutting down server"); + "Child %d: WAIT_FAILED -- shutting down server", my_pid); break; } else if (cld == 0) {