From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 16 Jun 2014 09:28:01 +0000 (+0000)
Subject: Mark all unused/duplicated/closed child listeners as inactive.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0d7b23b0479e2f57895aecba6fdfe9c67ad1539;p=thirdparty%2Fapache%2Fhttpd.git

Mark all unused/duplicated/closed child listeners as inactive.
Fix unused "ap_listen_rec *lr;" in worker_run().


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

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 601f1565cd2..d9db457a073 100644
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -2453,9 +2453,9 @@ static void child_main(int child_num_arg)
             lr = mpm_listen[i];
             while(lr) {
                 apr_socket_close(lr->sd);
+                lr->active = 0;
                 lr = lr->next;
             }
-            mpm_listen[i]->active = 0;
             ap_mpm_podx_close(pod[i]);
         }
     }
diff --git a/server/mpm/eventopt/eventopt.c b/server/mpm/eventopt/eventopt.c
index a42eb62aa1c..dbdc3150398 100644
--- a/server/mpm/eventopt/eventopt.c
+++ b/server/mpm/eventopt/eventopt.c
@@ -2256,9 +2256,9 @@ static void child_main(int child_num_arg)
             lr = mpm_listen[i];
             while(lr) {
                 apr_socket_close(lr->sd);
+                lr->active = 0;
                 lr = lr->next;
             }
-            mpm_listen[i]->active = 0;
             ap_mpm_podx_close(pod[i]);
         }
     }
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 016d95e7cdc..f78112ebcbe 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -529,15 +529,15 @@ static void child_main(int child_num_arg)
     apr_pool_create(&ptrans, pchild);
     apr_pool_tag(ptrans, "transaction");
 
-/* close unused listeners and pods */
+    /* close unused listeners and pods */
     for (i = 0; i < num_buckets; i++) {
         if (i != bucket[my_child_num]) {
             lr = mpm_listen[i];
             while(lr) {
                 apr_socket_close(lr->sd);
+                lr->active = 0;
                 lr = lr->next;
             }
-            mpm_listen[i]->active = 0;
             ap_mpm_pod_close(pod[i]);
         }
     }
diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 585481f62a6..486ce60b84b 100644
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -1241,9 +1241,9 @@ static void child_main(int child_num_arg)
             lr = mpm_listen[i];
             while(lr) {
                 apr_socket_close(lr->sd);
+                lr->active = 0;
                 lr = lr->next;
             }
-            mpm_listen[i]->active = 0;
             ap_mpm_podx_close(pod[i]);
         }
     }
@@ -1801,7 +1801,6 @@ static int worker_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
     int remaining_children_to_start;
     apr_status_t rv;
     int i;
-    ap_listen_rec *lr;
 
     ap_log_pid(pconf, ap_pid_fname);