From: Bill Stoddard <stoddard@apache.org>
Date: Tue, 3 Apr 2001 00:36:09 +0000 (+0000)
Subject: Some shutdown work.
X-Git-Tag: 2.0.16~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=461b8de2bce8c05d7020a6ed0793bfa039365cb7;p=thirdparty%2Fapache%2Fhttpd.git

Some shutdown work.


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

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 593826f70c7..4fda4feec8d 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -678,7 +678,7 @@ static void winnt_accept(void *listen_socket)
 
     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 @@ static void winnt_accept(void *listen_socket)
                 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,