www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

Mark all unused/duplicated/closed child listeners as inactive.

Browse Source 
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
This commit is contained in:
Yann Ylavic
2014-06-16 09:28:01 +00:00
parent 4fd8828745
commit d2e9cc1e16
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/mpm/event/event.c
View File

@@ -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]);
}
}

2
server/mpm/eventopt/eventopt.c
View File

@@ -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]);
}
}

4
server/mpm/prefork/prefork.c
View File

@@ -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]);
}
}

3
server/mpm/worker/worker.c
View File

@@ -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);