You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ni...@apache.org on 2007/08/07 15:01:54 UTC
svn commit: r563487 - /httpd/httpd/trunk/server/mpm/winnt/child.c
Author: niq
Date: Tue Aug 7 06:01:53 2007
New Revision: 563487
URL: http://svn.apache.org/viewvc?view=rev&rev=563487
Log:
PR 42572: crash in Windows MPM
Davi Arnauts simple patch confirmed as working.
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=563487&r1=563486&r2=563487
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/child.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/child.c Tue Aug 7 06:01:53 2007
@@ -1184,7 +1184,9 @@
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_log_error(APLOG_MARK, APLOG_NOTICE, APR_SUCCESS, ap_server_conf,