]> granicus.if.org Git - apache/commitdiff
Revert the patch. Although the problem still exists
authorMladen Turk <mturk@apache.org>
Wed, 2 Aug 2006 14:41:31 +0000 (14:41 +0000)
committerMladen Turk <mturk@apache.org>
Wed, 2 Aug 2006 14:41:31 +0000 (14:41 +0000)
its root cause is inside the wait_for_many_objects.

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

server/mpm/winnt/child.c

index f4381bc0d0a504ac5cd7dfc7554e7f6c0615b0c8..d950869806ab4e3f53096bbf6f78e9b52fa852c8 100644 (file)
@@ -1120,10 +1120,7 @@ void child_main(apr_pool_t *pconf)
     while (threads_created) {
         rv = wait_for_many_objects(threads_created, child_handles, (DWORD)(end_time - time(NULL)));
         if (rv != WAIT_TIMEOUT) {
-            if (rv >= WAIT_ABANDONED_0)
-                rv = rv - WAIT_ABANDONED_0;
-            else        
-                rv = rv - WAIT_OBJECT_0;
+            rv = rv - WAIT_OBJECT_0;
             ap_assert((rv >= 0) && (rv < threads_created));
             cleanup_thread(child_handles, &threads_created, rv);
             continue;