From: Jacob Champion Date: Thu, 10 Nov 2016 21:32:43 +0000 (+0000) Subject: Comment, promote X-Git-Tag: 2.4.24~145 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=706e4b9b5487a9e77ed9a9868a1487157918d68a;p=thirdparty%2Fapache%2Fhttpd.git Comment, promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1769200 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 75107061dd5..d6ee3531438 100644 --- a/STATUS +++ b/STATUS @@ -117,6 +117,11 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] + *) core: avoid adding multiple subrequest filters when there are nested + subrequests. PR58292 + trunk patch: http://svn.apache.org/r1698334 + 2.4.x patch: trunk works modulo CHANGES + +1: covener, jim, jchampion PATCHES PROPOSED TO BACKPORT FROM TRUNK: @@ -189,6 +194,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: ylavic: Maybe the -Werror case could be handled later, for now this series avoids a lot of "warning: 'aplog_module_index' defined but not used [-Wunused-const-variable=]" thanks to AP_MAYBE_UNUSED. + jchampion: Fine by me. I just think the dead code should be removed from + the backport in the meantime, so people don't have a false sense + of security. *) mod_cache: Bring up-to-date w/ trunk. trunk patch: @@ -211,12 +219,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: +1: jim, ylavic ylavic: r1756553 and r1649491 have a CHANGES entry. - *) core: avoid adding multiple subrequest filters when there are nested - subrequests. PR58292 - trunk patch: http://svn.apache.org/r1698334 - 2.4.x patch: trunk works modulo CHANGES - +1: covener, jim - *) mod_socache_memcache: Provide memcache STATs to mod_status trunk patch: http://svn.apache.org/r1768245 2.4.x patch: trunk works