From 07a3ab80f4beeb99108d23535f7f9b2e8c4c9cec Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 2 Dec 2014 12:45:12 +0000 Subject: [PATCH] promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1642854 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 76 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/STATUS b/STATUS index 024e99819f..c95a619975 100644 --- a/STATUS +++ b/STATUS @@ -104,11 +104,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - - -PATCHES PROPOSED TO BACKPORT FROM TRUNK: - [ New proposals should be added at the end of the list ] - *) SECURITY: CVE-2014-8109 (cve.mitre.org) mod_lua: Fix handling of the Require line when a LuaAuthzProvider is used in multiple Require directives with different arguments. @@ -116,7 +111,44 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: trunk patch: http://svn.apache.org/r1642499 2.4.x patch: trunk works: +1 covener, ylavic, jim - + + * event: avoid dereferencing a recently apr_pool_clear()'ed + event_conn_state_t *cs when ptrans is being recycled at EOR. + trunk patch: http://svn.apache.org/r1638879 + http://svn.apache.org/r1640031 + 2.4.x patch: trunk works + +1 covener, ylavic, jim + + * event: avoid potentially concurrent access to a 'cs' right as it goes + into lingering close. + trunk patch: http://svn.apache.org/r1639614 + 2.4.x patch: trunk works + +1: covener, ylavic, jim + + * mod_proxy_connect: Don't issue AH02447 on sockets hangups, let the read + determine whether it is a normal close or a real error. PR 57168. + trunk patch: http://svn.apache.org/r1635645 + 2.4.x patches: trunk works (modulo CHANGES). + +1: ylavic, covener, jim + + * mod_proxy_wstunnel: abort backend connection on polling error to avoid + further processing (lingering close, SSL shutdown). + trunk patch: http://svn.apache.org/r1635644 + 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_proxy_wstunnel-aborted.patch + +1: ylavic, covener, jim + + * mod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an error + when parsing or forwarding the response fails. + trunk patch: http://svn.apache.org/r1640040 + http://svn.apache.org/r1640042 + 2.4.x patch: trunk works (modulo CHANGES) + +1: ylavic, trawick, jim + + + +PATCHES PROPOSED TO BACKPORT FROM TRUNK: + [ New proposals should be added at the end of the list ] + * mod_proxy: Preserve original request headers even if they differ from the ones to be forwarded to the backend. PR 45387. trunk patch: http://svn.apache.org/r1588527 @@ -195,38 +227,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: The new AH* in script_log could also cause parsing issues, but I'm fine with this personnaly. - * event: avoid dereferencing a recently apr_pool_clear()'ed - event_conn_state_t *cs when ptrans is being recycled at EOR. - trunk patch: http://svn.apache.org/r1638879 - http://svn.apache.org/r1640031 - 2.4.x patch: trunk works - +1 covener, ylavic, jim - - * event: avoid potentially concurrent access to a 'cs' right as it goes - into lingering close. - trunk patch: http://svn.apache.org/r1639614 - 2.4.x patch: trunk works - +1: covener, ylavic, jim - - * mod_proxy_connect: Don't issue AH02447 on sockets hangups, let the read - determine whether it is a normal close or a real error. PR 57168. - trunk patch: http://svn.apache.org/r1635645 - 2.4.x patches: trunk works (modulo CHANGES). - +1: ylavic, covener, jim - - * mod_proxy_wstunnel: abort backend connection on polling error to avoid - further processing (lingering close, SSL shutdown). - trunk patch: http://svn.apache.org/r1635644 - 2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-mod_proxy_wstunnel-aborted.patch - +1: ylavic, covener, jim - - * mod_proxy_fcgi, mod_authnz_fcgi: stop reading the response and issue an error - when parsing or forwarding the response fails. - trunk patch: http://svn.apache.org/r1640040 - http://svn.apache.org/r1640042 - 2.4.x patch: trunk works (modulo CHANGES) - +1: ylavic, trawick, jim - * mod_proxy_fcgi: Ignore body data from backend for 304 responses. PR 57198. trunk patch: http://svn.apache.org/r1640495 2.4.x patch: trunk works -- 2.50.1