From: Ruediger Pluem Date: Tue, 26 Jul 2016 18:28:01 +0000 (+0000) Subject: * Vote and promote X-Git-Tag: 2.2.32~110 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f5b5ce8a376c14d18fe8c5072b1bf4d73163ee7;p=thirdparty%2Fapache%2Fhttpd.git * Vote and promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1754166 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 1b651112002..69649453399 100644 --- a/STATUS +++ b/STATUS @@ -104,21 +104,16 @@ RELEASE SHOWSTOPPERS: http://svn.apache.org/viewvc?rev=1753228&view=rev Backport version for 2.4.x of patch: Trunk version of patch works (modulo CHANGES) - +1: wrowe + +1: wrowe, rplue,m 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 ] - *) mod_mem_cache: Don't cache incomplete responses when the client aborts the connection, unless they are complete. PR 45049. Not applicable to trunk, mod_mem_cache doesn't exist there. 2.2.x patch: http://home.apache.org/~ylavic/patches/httpd-2.2.x-mod_mem_cache-pr45049.patch - +1: ylavic, wrowe + +1: ylavic, wrowe, rpluem ylavic: don't we know from the very beginning of store_body() if r->connection->aborted, so to fail there? rpluem: Agreed. I guess we can move this up to line 733 before the loop. @@ -135,6 +130,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: aborted the connection) where we now still cache it in any case if it is complete (for immediate availability for next clients). +PATCHES PROPOSED TO BACKPORT FROM TRUNK: + [ New proposals should be added at the end of the list ] + *) mod_proxy_connect: The connect method doesn't work if the client is connecting to the apache proxy through an ssl socket. Fixed. [Brad Boyer, Mark Cave-Ayland, Julian Gilbey, Fabrice Durand,