Commit 2a45e536 authored by Mladen Turk's avatar Mladen Turk
Browse files

Fix the assertion if the WaitForMutipleObjects 

returns WAIT_ABANDONED_NN instead presumed
WAIT_OBJECT_NN. This will correctly close the thread
handle without using invalid thread handle array index.

Spotted when large balancer timeout was set
and all the threads were busy waiting for the
connection:
[Wed Aug 02 14:29:58 2006] [crit] [Wed Aug 02 14:29:58 2006] file \\build-2.2.2\\server\\mpm\\winnt\\child.c, line 1120, assertion "(rv >= 0) && (rv < threads_created)" failed


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

server/mpm/winnt/child.c

+4 −1
Original line number Diff line number Diff line
@@ -1120,6 +1120,9 @@ 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;

            ap_assert((rv >= 0) && (rv < threads_created));

            cleanup_thread(child_handles, &threads_created, rv);