You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@apache.org on 2001/04/03 02:36:11 UTC
cvs commit: httpd-2.0/server/mpm/winnt mpm_winnt.c
stoddard 01/04/02 17:36:11
Modified: server/mpm/winnt mpm_winnt.c
Log:
Some shutdown work.
Revision Changes Path
1.151 +5 -2 httpd-2.0/server/mpm/winnt/mpm_winnt.c
Index: mpm_winnt.c
===================================================================
RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- mpm_winnt.c 2001/03/22 23:05:54 1.150
+++ mpm_winnt.c 2001/04/03 00:36:09 1.151
@@ -678,7 +678,7 @@
nlsd = (SOCKET) listen_socket;
- while (1) {
+ while (!shutdown_in_progress) {
pCompContext = NULL;
/* Grab a context off the queue */
apr_lock_acquire(qlock);
@@ -758,7 +758,10 @@
pCompContext->accept_socket = INVALID_SOCKET;
ap_log_error(APLOG_MARK, APLOG_DEBUG, lasterror, server_conf,
"winnt_accept: AcceptEx failed. Reallocate the accept socket and try again.");
- goto again;
+ if (shutdown_in_progress)
+ break;
+ else
+ goto again;
}
else if (lasterror != APR_FROM_OS_ERROR(ERROR_IO_PENDING)) {
ap_log_error(APLOG_MARK,APLOG_ERR, lasterror, server_conf,