From 177caa9011d2b287a10f9297dc7199f466e28aeb Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Sat, 5 Sep 2015 17:01:10 +0000 Subject: [PATCH] promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1701407 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 54 +++++++++++++++++++++++++++--------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/STATUS b/STATUS index 852eb25168..b0221a8fb1 100644 --- a/STATUS +++ b/STATUS @@ -109,6 +109,33 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] + *) apxs: add HTTPD_MMN and HTTPD_VERSION to apxs -q + trunk: http://svn.apache.org/r1693919 + 2.4.x: trunk works modulo CHANGES + +1: covener, ylavic, jim + + *) mod_rewrite: Allow cookies to include ':' by using an alternate separator. + PR47241. + trunk: http://svn.apache.org/r1693963 + 2.4.x: trunk works modulo CHANGES + +1: covener, ylavic, jim + + *) mod_session_dbd: fix lifetime of Request notes. + trunk: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session_dbd.c?r1=1679181&r2=1687087&view=patch + 2.4.x: trunk patch applies. + +1: niq, ylavic, jim + + *) mod_proxy: Give ap_proxy_post_request as chance to act correctly on the status code + by setting r->status temporarily to access_status. r->status might be different than + access_status e.g. r->status could be HTTP_OK if e.g. we override the error page on + the proxy or if the error was not generated by the backend itself but by the proxy + e.g. a bad gateway. + Trunk version of patch: + http://svn.apache.org/r1597352 + Backport version for 2.4.x of patch: + Trunk version of patch works + +1: rpluem, ylavic,, jim + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -228,39 +255,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: as it also catches the case where a connection establishment took long and the worker went into error meanwhile. - *) apxs: add HTTPD_MMN and HTTPD_VERSION to apxs -q - trunk: http://svn.apache.org/r1693919 - 2.4.x: trunk works modulo CHANGES - +1: covener, ylavic, jim - - *) mod_rewrite: Allow cookies to include ':' by using an alternate separator. - PR47241. - trunk: http://svn.apache.org/r1693963 - 2.4.x: trunk works modulo CHANGES - +1: covener, ylavic, jim - - *) mod_session_dbd: fix lifetime of Request notes. - trunk: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session_dbd.c?r1=1679181&r2=1687087&view=patch - 2.4.x: trunk patch applies. - +1: niq, ylavic, jim - *) util_script: Make REDIRECT_URL a complete URL (where set). PR 57785 trunk: http://svn.apache.org/viewvc?view=revision&revision=1677702 2.4.x: trunk patch applies. +1: niq - *) mod_proxy: Give ap_proxy_post_request as chance to act correctly on the status code - by setting r->status temporarily to access_status. r->status might be different than - access_status e.g. r->status could be HTTP_OK if e.g. we override the error page on - the proxy or if the error was not generated by the backend itself but by the proxy - e.g. a bad gateway. - Trunk version of patch: - http://svn.apache.org/r1597352 - Backport version for 2.4.x of patch: - Trunk version of patch works - +1: rpluem, ylavic,, jim - *) core/mod_ssl: add Protocols/ProtocolsHonorOrder directives and new protocols hooks to control Upgrade: and ALPN protocol switching. HTTP_MISDIRECTED_REQUEST addition and handling in mod_ssl