Hi Christophe, it should probably for consistency, although I don't see how child_num could be negative in httpd. Since PR 56767 is triggered by a third-party module, we'd better be safe here too.
Regards, Yann. On Tue, Dec 9, 2014 at 7:17 AM, Christophe JAILLET <[email protected]> wrote: > Ping. > > > Le 03/12/2014 07:19, Christophe JAILLET a écrit : > >> Hi, >> >> should the same logic be applied in: >> - ap_increment_counts (at line 367) ? (code looks like in >> ap_time_process_request where the <0 test is done) >> >> >> CJ >> >> Le 02/12/2014 13:42, [email protected] a écrit : >>> >>> Author: jim >>> Date: Tue Dec 2 12:42:39 2014 >>> New Revision: 1642851 >>> >>> URL: http://svn.apache.org/r1642851 >>> Log: >>> 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 >>> >>> Modified: >>> httpd/httpd/branches/2.4.x/ (props changed) >>> httpd/httpd/branches/2.4.x/STATUS >>> httpd/httpd/branches/2.4.x/server/scoreboard.c >>> >>> Propchange: httpd/httpd/branches/2.4.x/ >>> >>> ------------------------------------------------------------------------------ >>> Merged /httpd/httpd/trunk:r1638073 >>> >>> Modified: httpd/httpd/branches/2.4.x/STATUS >>> URL: >>> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1642851&r1=1642850&r2=1642851&view=diff >>> >>> ============================================================================== >>> --- httpd/httpd/branches/2.4.x/STATUS (original) >>> +++ httpd/httpd/branches/2.4.x/STATUS Tue Dec 2 12:42:39 2014 >>> @@ -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 >>> >>> Modified: httpd/httpd/branches/2.4.x/server/scoreboard.c >>> URL: >>> http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/scoreboard.c?rev=1642851&r1=1642850&r2=1642851&view=diff >>> >>> ============================================================================== >>> --- httpd/httpd/branches/2.4.x/server/scoreboard.c (original) >>> +++ httpd/httpd/branches/2.4.x/server/scoreboard.c Tue Dec 2 12:42:39 >>> 2014 >>> @@ -527,7 +527,7 @@ AP_DECLARE(int) ap_update_child_status_f >>> 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(a >>> 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, >>> >> >
