diff options
| author | Jim Jagielski <jim@apache.org> | 2014-02-20 19:38:49 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2014-02-20 19:38:49 +0000 |
| commit | 71727f8a67f68755aeb38d525d5b69751c8a7094 (patch) | |
| tree | d16ba9d2c574b79a789654eee14ef132130540ac /server | |
| parent | 604d9be7504f8e99407ff44fa17f6b94bcb03e2c (diff) | |
| download | httpd-71727f8a67f68755aeb38d525d5b69751c8a7094.tar.gz | |
Merge r1542379 from trunk:
PR: 54852. Only use a dummy_connection for idle processes
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1570327 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
| -rw-r--r-- | server/mpm_unix.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/server/mpm_unix.c b/server/mpm_unix.c index 063af725f4..0000cb6672 100644 --- a/server/mpm_unix.c +++ b/server/mpm_unix.c @@ -742,7 +742,12 @@ void ap_mpm_pod_killpg(ap_pod_t *pod, int num) * readers stranded (a number of them could be tied up for * a while serving time-consuming requests) */ + /* Recall: we only worry about IDLE child processes here */ for (i = 0; i < num && rv == APR_SUCCESS; i++) { + if (ap_scoreboard_image->servers[i][0].status != SERVER_READY || + ap_scoreboard_image->servers[i][0].pid == 0) { + continue; + } rv = dummy_connection(pod); } } |