From b91c71fda07b7124c52f62da95e735e880a575a6 Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Thu, 18 Jul 2019 13:44:28 +0000 Subject: [PATCH] * vote+promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1863314 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/STATUS b/STATUS index 7010ec2f149..99b8857b281 100644 --- a/STATUS +++ b/STATUS @@ -158,6 +158,15 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: 2.4.x: svn merge -c 1862014 ^/httpd/httpd/trunk . +1: jfclere, icing, jim + *) core: Split out the ability to parse wildcard files and directories + from the Include/IncludeOptional directives into a generic set of + functions ap_dir_nofnmatch() and ap_dir_fnmatch(). + trunk patch: http://svn.apache.org/r1847430 + http://svn.apache.org/r1853302 + 2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-ap_dir_fnmatch-2.patch + +1: minfrin, jim, icing + jailletc36: at least, r1853302 is required, IMHO + minfrin: r1853302 is added in above, jim agrees PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -189,16 +198,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: reworked, etc.. I would like to avoid a patch that is clearly wrong for some reviewer sitting here for months/years without any action item :) - *) core: Split out the ability to parse wildcard files and directories - from the Include/IncludeOptional directives into a generic set of - functions ap_dir_nofnmatch() and ap_dir_fnmatch(). - trunk patch: http://svn.apache.org/r1847430 - http://svn.apache.org/r1853302 - 2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-ap_dir_fnmatch-2.patch - +1: minfrin, jim - jailletc36: at least, r1853302 is required, IMHO - minfrin: r1853302 is added in above, jim agrees - *) mod_http2: fixes Timeout vs. KeepAliveTimeout behaviour, see PR 63534. Fixes stream cleanup when connection throttling is in place. Counts stream resets by client on streams initiated by client as cause for connection throttling. -- 2.47.3