From: Mladen Turk <mturk@apache.org>
Date: Wed, 2 Aug 2006 14:41:31 +0000 (+0000)
Subject: Revert the patch. Although the problem still exists
X-Git-Tag: 2.3.0~2181
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a409ec882909b6f6dd2808eabc8b9843512fbc93;p=thirdparty%2Fapache%2Fhttpd.git

Revert the patch. Although the problem still exists
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
---

diff --git a/server/mpm/winnt/child.c b/server/mpm/winnt/child.c
index f4381bc0d0a..d950869806a 100644
--- a/server/mpm/winnt/child.c
+++ b/server/mpm/winnt/child.c
@@ -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;