WinNT MPM: Fix a broken log message at termination.

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

diff --git a/CHANGES b/CHANGES
index b64e8229efac55faa73b23b83869533c8564a86e..2fa6196d5fa91a8cf37299163e9c31cc928a3fde 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 Changes with Apache 2.0.51
+
+  *) WinNT MPM: Fix a broken log message at termination.  PR 28063.
+     [Eider Oliveira <eider bol.com.br>]
+
   *) Prevent Win32 pool corruption at startup [Allan Edwards]
 
   *) mod_ssl: Add "SSLUserName" directive to set r->user based on a

diff --git a/STATUS b/STATUS
index 282f4e68bbdaf784f549fc24005fbe1f471a5775..afda8fc52499ebc261b6330b74d936245a003380 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2004/08/25 15:20:15 $]
+Last modified at [$Date: 2004/08/26 01:03:20 $]
 
 Release:
 
@@ -194,14 +194,6 @@ PATCHES TO BACKPORT FROM 2.1
        0: nd: IMHO that's a public API change then and not applicable for
               2.0, just let 'em in
 
-    *) Prevent Win32 pool corruption at startup
-         server/mpm/winnt/child.c: r1.36 
-       +1: ake, trawick, nd, stoddard
-
-    *) WinNT MPM: Fix a broken log message at termination.  PR 28063.
-         server/mpm/winnt/child.c: r1.37
-       +1: trawick, nd
-
     *) mod_actions: Regression from 1.3: the file referred to must exist.
        Solve this by introducing the "virtual" modifier to the Action
        directive. PR 28553.

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index a166a49ceeba0207dd061b96060b5d0da55a4cdd..0fb47b9c510cde6677a28b696c7f8e84e5291718 100644 (file)
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -1080,7 +1080,8 @@ void child_main(apr_pool_t *pconf)
     /* Kill remaining threads off the hard way */
     if (threads_created) {
         ap_log_error(APLOG_MARK,APLOG_NOTICE, APR_SUCCESS, ap_server_conf, 
-                     "Child %d: Terminating %d threads that failed to exit.", my_pid);
+                     "Child %d: Terminating %d threads that failed to exit.", 
+                     my_pid, threads_created);
     }
     for (i = 0; i < threads_created; i++) {
         int *score_idx;