From: Jim Jagielski Date: Tue, 11 Nov 2008 19:57:14 +0000 (+0000) Subject: Promote X-Git-Tag: 2.2.11~82 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e974231a54e682039d69bf689e96848b6e2c3f51;p=thirdparty%2Fapache%2Fhttpd.git Promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@713139 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 8196a22affe..550f5e0eed0 100644 --- a/STATUS +++ b/STATUS @@ -85,40 +85,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 ] - - * mod_ssl: Add server name indication (RFC 4366) support (PR 34607). - Trunk version of patches: - http://svn.apache.org/viewvc?view=rev&revision=606190 - http://svn.apache.org/viewvc?view=rev&revision=607420 - http://svn.apache.org/viewvc?view=rev&revision=607425 - http://svn.apache.org/viewvc?view=rev&revision=611216 - http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c?r1=611216&r2=630436 - http://svn.apache.org/viewvc?view=rev&revision=662815 - - Backport version for 2.2.x of updated patch: - http://people.apache.org/~fuankg/diffs/httpd-2.2.x-sni.diff - +1: fuankg - +0: like ssl upgrade of 2.2, perhaps this is a good reason to bring - httpd-2.4 to completion? vhost changes could be disruptive to - third party module authors. - -1: rpluem: jorton found some problems with the trunk version and they - should be fixed / discussed in trunk before we backport. - - * mod_rewrite: Export and install the mod_rewrite.h header to ensure the - optional rewrite_mapfunc_t and ap_register_rewrite_mapfunc functions are - available to third party modules. - Trunk version of patch: - http://svn.apache.org/viewvc?rev=704726&view=rev - http://svn.apache.org/viewvc?rev=704845&view=rev - Backport version to 2.2: - http://people.apache.org/~minfrin/httpd-mod-rewrite.diff - +1: minfrin - rpluem says: The patch to ap_mmn.h does only contain the comment, but does - not change the #define. Once this is fixed I am +1. - * mod_proxy: Prevent segmentation faults by correctly adjusting the lifetime of the buckets read from the proxy backend. PR 45792 @@ -147,14 +113,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: Trunk version of patch works +1: rpluem, jim, pgollucci - * mod_proxy_balancer: Add in forced recovery for balancer - members if all are in error state. - Trunk version of patch: - http://svn.apache.org/viewcvs.cgi?rev=451572&view=rev - Backport version for 2.2.x of patch: - http://people.apache.org/~jim/patches/proxy-force-recovery.patch.txt - +1: jim - * mod_expires: Do not sets negative max-age / Expires header in the past. PR 39774 [Jim Jagielski] Trunk version of patch: @@ -170,6 +128,48 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: Trunk version of patch works +1: jim, rpluem, pgollucci + +PATCHES PROPOSED TO BACKPORT FROM TRUNK: + [ New proposals should be added at the end of the list ] + + * mod_ssl: Add server name indication (RFC 4366) support (PR 34607). + Trunk version of patches: + http://svn.apache.org/viewvc?view=rev&revision=606190 + http://svn.apache.org/viewvc?view=rev&revision=607420 + http://svn.apache.org/viewvc?view=rev&revision=607425 + http://svn.apache.org/viewvc?view=rev&revision=611216 + http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_kernel.c?r1=611216&r2=630436 + http://svn.apache.org/viewvc?view=rev&revision=662815 + + Backport version for 2.2.x of updated patch: + http://people.apache.org/~fuankg/diffs/httpd-2.2.x-sni.diff + +1: fuankg + +0: like ssl upgrade of 2.2, perhaps this is a good reason to bring + httpd-2.4 to completion? vhost changes could be disruptive to + third party module authors. + -1: rpluem: jorton found some problems with the trunk version and they + should be fixed / discussed in trunk before we backport. + + * mod_rewrite: Export and install the mod_rewrite.h header to ensure the + optional rewrite_mapfunc_t and ap_register_rewrite_mapfunc functions are + available to third party modules. + Trunk version of patch: + http://svn.apache.org/viewvc?rev=704726&view=rev + http://svn.apache.org/viewvc?rev=704845&view=rev + Backport version to 2.2: + http://people.apache.org/~minfrin/httpd-mod-rewrite.diff + +1: minfrin + rpluem says: The patch to ap_mmn.h does only contain the comment, but does + not change the #define. Once this is fixed I am +1. + + * mod_proxy_balancer: Add in forced recovery for balancer + members if all are in error state. + Trunk version of patch: + http://svn.apache.org/viewcvs.cgi?rev=451572&view=rev + Backport version for 2.2.x of patch: + http://people.apache.org/~jim/patches/proxy-force-recovery.patch.txt + +1: jim + * Build: Correctly set SSL_LIBS during openssl detection if pkgconfig is not available. This fixes a regression against 2.2.9. PR 46018