]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
check the pod in the child at a different spot so that we check it
authorJeff Trawick <trawick@apache.org>
Thu, 7 Jun 2001 16:49:03 +0000 (16:49 +0000)
committerJeff Trawick <trawick@apache.org>
Thu, 7 Jun 2001 16:49:03 +0000 (16:49 +0000)
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

server/mpm/prefork/prefork.c

index f3b1d13a93e67e46af77f49b3c08254f6ca7973b..f76d2e568f1b0272e41440fe022b1855127d8365 100644 (file)
@@ -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)