You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2014/06/16 11:28:01 UTC
svn commit: r1602826 - in /httpd/httpd/trunk/server/mpm: event/event.c
eventopt/eventopt.c prefork/prefork.c worker/worker.c
Author: ylavic
Date: Mon Jun 16 09:28:01 2014
New Revision: 1602826
URL: http://svn.apache.org/r1602826
Log:
Mark all unused/duplicated/closed child listeners as inactive.
Fix unused "ap_listen_rec *lr;" in worker_run().
Modified:
httpd/httpd/trunk/server/mpm/event/event.c
httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
httpd/httpd/trunk/server/mpm/prefork/prefork.c
httpd/httpd/trunk/server/mpm/worker/worker.c
Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1602826&r1=1602825&r2=1602826&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Mon Jun 16 09:28:01 2014
@@ -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]);
}
}
Modified: httpd/httpd/trunk/server/mpm/eventopt/eventopt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/eventopt/eventopt.c?rev=1602826&r1=1602825&r2=1602826&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/eventopt/eventopt.c (original)
+++ httpd/httpd/trunk/server/mpm/eventopt/eventopt.c Mon Jun 16 09:28:01 2014
@@ -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]);
}
}
Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=1602826&r1=1602825&r2=1602826&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Mon Jun 16 09:28:01 2014
@@ -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]);
}
}
Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=1602826&r1=1602825&r2=1602826&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Mon Jun 16 09:28:01 2014
@@ -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
int remaining_children_to_start;
apr_status_t rv;
int i;
- ap_listen_rec *lr;
ap_log_pid(pconf, ap_pid_fname);