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 601f1565cd2eb072df22dba022feeec566414675..d9db457a0734cf81c6df8d9be8136f8b3d7fbc40 100644 (file)
--- 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 a42eb62aa1cc54be4c43cfbc89cb904632d9e8d8..dbdc3150398bd5b4be04bfcc083f0fb137f1eb20 100644 (file)
--- 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 016d95e7cdc54f730912b0fc9c27256792fc8be8..f78112ebcbe388b65ec9445a0b7c836149449a05 100644 (file)
--- 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 585481f62a6df810c1f22e6a1aa354abc51246aa..486ce60b84bc99b583a0a88217a7fd44efadc36b 100644 (file)
--- 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);