httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r1608909 - in /httpd/httpd/branches/2.4.x: ./ server/mpm/winnt/child.c
Date Tue, 08 Jul 2014 19:21:31 GMT
Author: trawick
Date: Tue Jul  8 19:21:31 2014
New Revision: 1608909

URL: http://svn.apache.org/r1608909
Log:
merge comment clarification from trunk r1608785

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1608785

Modified: httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c?rev=1608909&r1=1608908&r2=1608909&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/winnt/child.c Tue Jul  8 19:21:31 2014
@@ -1123,7 +1123,7 @@ void child_main(apr_pool_t *pconf, DWORD
         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) {



Mime
View raw message