From: Jim Jagielski Date: Tue, 2 Dec 2014 12:42:39 +0000 (+0000) Subject: Merge r1638073 from trunk: X-Git-Tag: 2.4.11~127 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d3229a9e154678d48b137caaa9e08990f32d798;p=thirdparty%2Fapache%2Fhttpd.git Merge r1638073 from trunk: * server/scoreboard.c: Check for child_num < 0 also in ap_update_child_status and ap_update_child_status_from_conn. PR 56767. Submitted by: jkaluza Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1642851 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 0914962a432..cdfbb0bf72b 100644 --- a/STATUS +++ b/STATUS @@ -104,12 +104,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * core: Check for child_num < 0 also in ap_update_child_status - and ap_update_child_status_from_conn in scoreboard.c. PR 56767. - trunk patch: http://svn.apache.org/r1638073 - 2.4.x patch: trunk works - +1: jkaluza, covener, ylavic - * core: Do not match files when using DirectoryMatch. PR 41867. trunk patch: http://svn.apache.org/r1635428 2.4.x patch: http://people.apache.org/~jkaluza/patches/httpd-2.4.x-directorymatch.patch diff --git a/server/scoreboard.c b/server/scoreboard.c index 73bdccdd426..fa04b91ff41 100644 --- a/server/scoreboard.c +++ b/server/scoreboard.c @@ -527,7 +527,7 @@ AP_DECLARE(int) ap_update_child_status_from_indexes(int child_num, AP_DECLARE(int) ap_update_child_status(ap_sb_handle_t *sbh, int status, request_rec *r) { - if (!sbh) + if (!sbh || (sbh->child_num < 0)) return -1; return update_child_status_internal(sbh->child_num, sbh->thread_num, @@ -539,7 +539,7 @@ AP_DECLARE(int) ap_update_child_status(ap_sb_handle_t *sbh, int status, AP_DECLARE(int) ap_update_child_status_from_conn(ap_sb_handle_t *sbh, int status, conn_rec *c) { - if (!sbh) + if (!sbh || (sbh->child_num < 0)) return -1; return update_child_status_internal(sbh->child_num, sbh->thread_num,