]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Fix some broken log messages in WinNT MPM.
authorBill Stoddard <stoddard@apache.org>
Mon, 23 Jun 2003 13:15:21 +0000 (13:15 +0000)
committerBill Stoddard <stoddard@apache.org>
Mon, 23 Jun 2003 13:15:21 +0000 (13:15 +0000)
Submitted by: Juan Rivera <Juan.Rivera@citrix.com>

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/APACHE_2_0_BRANCH@100341 13f79535-47bb-0310-9956-ffa450edef68

STATUS
server/mpm/winnt/child.c

diff --git a/STATUS b/STATUS
index 3fad7c6cd96915bcb506f649b5edbd17fdc9bb55..4d14eba7b00deaa4df1eeeea51f26f270eb4f77a 100644 (file)
--- 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
index 5ca5f7ca4f046a6f80c119533e880fa14085f566..d890db860db625d1a6a5e679747e571fe405b97b 100644 (file)
@@ -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) {