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 2003/06/05 18:54:49 UTC
cvs commit: httpd-2.0/server/mpm/winnt child.c
trawick 2003/06/05 09:54:48
Modified: . CHANGES
server/mpm/winnt child.c
Log:
Fix some broken log messages in WinNT MPM.
Submitted by: Juan Rivera <Ju...@citrix.com>
Reviewed by: Jeff Trawick
Revision Changes Path
1.1196 +3 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.1195
retrieving revision 1.1196
diff -u -r1.1195 -r1.1196
--- CHANGES 3 Jun 2003 22:13:53 -0000 1.1195
+++ CHANGES 5 Jun 2003 16:54:47 -0000 1.1196
@@ -2,6 +2,9 @@
[Remove entries to the current 2.0 section below, when backported]
+ *) Fix some broken log messages in WinNT MPM.
+ [Juan Rivera <Ju...@citrix.com>]
+
*) Add support for "streamy" PROPFIND responses.
[Ben Collins-Sussman <su...@collab.net>]
1.15 +2 -2 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- child.c 4 Mar 2003 22:15:51 -0000 1.14
+++ child.c 5 Jun 2003 16:54:48 -0000 1.15
@@ -899,7 +899,7 @@
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;
}
@@ -966,7 +966,7 @@
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) {