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 2011/04/08 21:37:42 UTC
svn commit: r1090412 - in /httpd/httpd/trunk/server/mpm/winnt: child.c
mpm_winnt.c
Author: trawick
Date: Fri Apr 8 19:37:41 2011
New Revision: 1090412
URL: http://svn.apache.org/viewvc?rev=1090412&view=rev
Log:
log message fixes/tweaks
Modified:
httpd/httpd/trunk/server/mpm/winnt/child.c
httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
Modified: httpd/httpd/trunk/server/mpm/winnt/child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/child.c?rev=1090412&r1=1090411&r2=1090412&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/child.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/child.c Fri Apr 8 19:37:41 2011
@@ -338,7 +338,7 @@ reinit: /* target of data or connect upo
}
ap_log_error(APLOG_MARK, APLOG_INFO, 0, ap_server_conf,
- "Child: Accept thread listening on %s:%d using %s",
+ "Child: Accept thread listening on %s:%d using AcceptFilter %s",
lr->bind_addr->hostname ? lr->bind_addr->hostname : "*",
lr->bind_addr->port, accf_name);
@@ -591,7 +591,7 @@ reinit: /* target of data or connect upo
continue;
}
- /* A more serious error that 'retry', log it */
+ /* A more serious error than 'retry', log it */
ap_log_error(APLOG_MARK, APLOG_WARNING,
rv, ap_server_conf,
"accept() failed.");
Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c?rev=1090412&r1=1090411&r2=1090412&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c Fri Apr 8 19:37:41 2011
@@ -431,7 +431,7 @@ static void get_listeners_from_parent(se
if (!ReadFile(pipe, &WSAProtocolInfo, sizeof(WSAPROTOCOL_INFO),
&BytesRead, (LPOVERLAPPED) NULL)) {
ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), ap_server_conf,
- "setup_inherited_listeners: Unable to read socket data from parent");
+ "Child: Unable to read socket data from parent");
exit(APEXIT_CHILDINIT);
}
@@ -439,13 +439,13 @@ static void get_listeners_from_parent(se
&WSAProtocolInfo, 0, 0);
if (nsd == INVALID_SOCKET) {
ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_netos_error(), ap_server_conf,
- "Child: setup_inherited_listeners(), WSASocket failed to open the inherited socket.");
+ "Child: WSASocket failed to open the inherited socket");
exit(APEXIT_CHILDINIT);
}
if (!SetHandleInformation((HANDLE)nsd, HANDLE_FLAG_INHERIT, 0)) {
ap_log_error(APLOG_MARK, APLOG_ERR, apr_get_os_error(), ap_server_conf,
- "set_listeners_noninheritable: SetHandleInformation failed.");
+ "Child: SetHandleInformation failed");
}
apr_os_sock_put(&lr->sd, &nsd, s->process->pool);
}
@@ -755,13 +755,13 @@ static int master_main(server_rec *s, HA
if (rv == WAIT_FAILED) {
/* Something serious is wrong */
ap_log_error(APLOG_MARK,APLOG_CRIT, apr_get_os_error(), ap_server_conf,
- "master_main: WaitForMultipeObjects WAIT_FAILED -- doing server shutdown");
+ "master_main: WaitForMultipleObjects WAIT_FAILED -- doing server shutdown");
shutdown_pending = 1;
}
else if (rv == WAIT_TIMEOUT) {
/* Hey, this cannot happen */
ap_log_error(APLOG_MARK, APLOG_ERR, apr_get_os_error(), s,
- "master_main: WaitForMultipeObjects with INFINITE wait exited with WAIT_TIMEOUT");
+ "master_main: WaitForMultipleObjects with INFINITE wait exited with WAIT_TIMEOUT");
shutdown_pending = 1;
}
else if (cld == SHUTDOWN_HANDLE) {