Commit 082c6484 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

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
parent a5782e46

server/mpm/prefork/prefork.c

+2 −2
Original line number Diff line number Diff line
@@ -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)