summaryrefslogtreecommitdiffstats
path: root/server/mpm_unix.c
diff options
context:
space:
mode:
authorJim Jagielski <jim@apache.org>2013-11-15 20:29:11 +0100
committerJim Jagielski <jim@apache.org>2013-11-15 20:29:11 +0100
commit62bb83d16fd84c439b188bdc1a265cb3094f1c14 (patch)
tree2c1763504d56d6ba04ea300d0cd7f3c08ac85562 /server/mpm_unix.c
parent[Doc][trunk] Introducing french translation for misc/password_encryption (diff)
downloadapache2-62bb83d16fd84c439b188bdc1a265cb3094f1c14.tar.xz
apache2-62bb83d16fd84c439b188bdc1a265cb3094f1c14.zip
PR: 54852. Only use a dummy_connection for idle processes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1542379 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--server/mpm_unix.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/server/mpm_unix.c b/server/mpm_unix.c
index a70c2714ae..ca880e5db7 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);
}
}