svn commit: r563489 - /httpd/httpd/trunk/server/mpm/winnt/child.c

[ni...@apache.org]

Author: niq
Date: Tue Aug  7 06:03:03 2007
New Revision: 563489

URL: http://svn.apache.org/viewvc?view=rev&rev=563489
Log:
PR 42572: crash in Windows MPM
Davi Arnauts simple patch confirmed as working.
(typo in my last commit)

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?view=diff&rev=563489&r1=563488&r2=563489
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/child.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/child.c Tue Aug  7 06:03:03 2007
@@ -1184,10 +1184,10 @@
         TerminateThread(child_handles[i], 1);
         CloseHandle(child_handles[i]);
         /* Reset the scoreboard entry for the thread we just whacked */
+        score_idx = apr_hash_get(ht, &child_handles[i], sizeof(HANDLE));
         if (score_idx) {
-            score_idx = apr_hash_get(ht, &child_handles[i], sizeof(HANDLE));
+            ap_update_child_status_from_indexes(0, *score_idx, SERVER_DEAD, NULL);
         }
-        ap_update_child_status_from_indexes(0, *score_idx, SERVER_DEAD, NULL);
     }
     ap_log_error(APLOG_MARK, APLOG_NOTICE, APR_SUCCESS, ap_server_conf,
                  "Child %d: All worker threads have exited.", my_pid);