You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2004/08/14 12:57:13 UTC
cvs commit: httpd-2.0/server/mpm/winnt child.c
trawick 2004/08/14 03:57:13
Modified: . CHANGES
server/mpm/winnt child.c
Log:
WinNT MPM: Fix a broken log message at termination.
PR: 28063
Submitted by: Eider Oliveira <eider bol.com.br>
Reviewed by: Jeff Trawick
Revision Changes Path
1.1551 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.1550
retrieving revision 1.1551
diff -u -r1.1550 -r1.1551
--- CHANGES 14 Aug 2004 10:49:43 -0000 1.1550
+++ CHANGES 14 Aug 2004 10:57:13 -0000 1.1551
@@ -2,6 +2,9 @@
[Remove entries to the current 2.0 section below, when backported]
+ *) WinNT MPM: Fix a broken log message at termination. PR 28063.
+ [Eider Oliveira <eider bol.com.br>]
+
*) Improve error handling for corrupted pid files. [Jeff Trawick]
*) mod_proxy.c and proxy_util.c: Enable compiling on 2.0-HEAD
1.37 +2 -1 httpd-2.0/server/mpm/winnt/child.c
Index: child.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/child.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- child.c 3 May 2004 22:22:50 -0000 1.36
+++ child.c 14 Aug 2004 10:57:13 -0000 1.37
@@ -1126,7 +1126,8 @@
/* 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;