From: Jeff Trawick Date: Tue, 8 Jul 2014 19:21:31 +0000 (+0000) Subject: merge comment clarification from trunk r1608785 X-Git-Tag: 2.4.10~60 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f6c7e37ed86c937d4e52f050630018e3f27b10d;p=apache merge comment clarification from trunk r1608785 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1608909 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c index 4ccf64894d..44692f2ce8 100644 --- a/server/mpm/winnt/child.c +++ b/server/mpm/winnt/child.c @@ -1123,7 +1123,7 @@ void child_main(apr_pool_t *pconf, DWORD parent_pid) rv = WaitForMultipleObjects(num_events, (HANDLE *)child_events, FALSE, INFINITE); cld = rv - WAIT_OBJECT_0; #else - /* THIS IS THE EXPECTED BUILD VARIATION */ + /* THIS IS THE EXPECTED BUILD VARIATION -- APR_HAS_OTHER_CHILD */ rv = WaitForMultipleObjects(num_events, (HANDLE *)child_events, FALSE, 1000); cld = rv - WAIT_OBJECT_0; if (rv == WAIT_TIMEOUT) {