From: Jeff Trawick <trawick@apache.org>
Date: Thu, 7 Jun 2001 16:49:03 +0000 (+0000)
Subject: check the pod in the child at a different spot so that we check it
X-Git-Tag: 2.0.19~119
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=457cb3335f80a1109c9b294ae75ab2b9245ca972;p=thirdparty%2Fapache%2Fhttpd.git

check the pod in the child at a different spot so that we check it
when we get a new connection; we were (essentially) never checking it
before

we check it when weird errors occur too but that shouldn't matter


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89295 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index f3b1d13a93e..f76d2e568f1 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -665,8 +665,6 @@ static void child_main(int child_num_arg)
 		    clean_child_exit(0);
 		}
 		stat = apr_accept(&csd, sd, ptrans);
-		if (stat == APR_SUCCESS || !APR_STATUS_IS_EINTR(stat))
-		    break;
                 /* In reality, this could be done later, but to keep it
                  * consistent with MPMs that have a thread race-condition,
                  * we will do it here.
@@ -674,6 +672,8 @@ static void child_main(int child_num_arg)
                 if (!ap_mpm_pod_check(pod)) {
                     die_now = 1;
                 }
+		if (stat == APR_SUCCESS || !APR_STATUS_IS_EINTR(stat))
+		    break;
 	    }
 
 	    if (stat == APR_SUCCESS)