httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r428009 - /httpd/httpd/trunk/server/mpm/winnt/child.c
Date Wed, 02 Aug 2006 14:41:33 GMT
Author: mturk
Date: Wed Aug  2 07:41:31 2006
New Revision: 428009

URL: http://svn.apache.org/viewvc?rev=428009&view=rev
Log:
Revert the patch. Although the problem still exists
its root cause is inside the wait_for_many_objects.

Modified:
    httpd/httpd/trunk/server/mpm/winnt/child.c

Modified: httpd/httpd/trunk/server/mpm/winnt/child.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/child.c?rev=428009&r1=428008&r2=428009&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/child.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/child.c Wed Aug  2 07:41:31 2006
@@ -1120,10 +1120,7 @@
     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;



Mime
View raw message