From: Jim Jagielski <jim@apache.org>
Date: Thu, 5 Jun 2014 13:38:08 +0000 (+0000)
Subject: fix restart issues
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a783a0807bbe4035f10a5e32193ff313cf5e1faf;p=thirdparty%2Fapache%2Fhttpd.git

fix restart issues

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

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index beab93f6fe2..d682452b20d 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -971,9 +971,6 @@ static int prefork_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
             return DONE;
         }
      }
-    for (lr = ap_listeners; lr; lr = lr->next) {
-        apr_socket_close(lr->sd);
-    }
 
     if (!retained->is_graceful) {
         if (ap_run_pre_mpm(s->process->pool, SB_SHARED) != OK) {
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 90510005d5f..d6ab4aefe23 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1816,9 +1816,6 @@ static int worker_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
             return DONE;
         }
     }
-    for (lr = ap_listeners; lr; lr = lr->next) {
-        apr_socket_close(lr->sd);
-     }
 
     if (!retained->is_graceful) {
         if (ap_run_pre_mpm(s->process->pool, SB_SHARED) != OK) {