From fd1de9872592e4b458da5b4d3510e89646ef8cde Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 10 Jul 2012 14:08:23 +0000 Subject: [PATCH] promote git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1359683 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/STATUS b/STATUS index de46f08caf..1071a75e73 100644 --- a/STATUS +++ b/STATUS @@ -88,16 +88,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_rewrite: Fix RewriteCond integer checks to be parsed correctly. - (PR 53023) - Patch: http://svn.apache.org/viewvc?view=revision&revision=1309602 - (applies cleanly to 2.4.x) - +1: nd - * mod_authz_core: Fix parsing of Require arguments in . Add some logging and an assert for a case that should not happen. PR: 53048 @@ -113,16 +103,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 53104. [Greg Ames] +1: sf, covener, druggeri, jim - * mod_ssl: Add support for Next Protocol Negotiation. - Trunk patch: - http://svn.apache.org/viewvc?view=revision&revision=1332643 - 2.4.x patch: - Trunk patch works. - +1: ben - sf says: Needs r1345599, too. - And wrowe's comment about the 2.2 patch is also valid for 2.4: - http://svn.apache.org/viewvc?view=revision&revision=1354823 - * configure: Enforce 1.4.0 as minimum APR version requirement. PR: 52748 trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1347998 @@ -135,6 +115,26 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: http://people.apache.org/~jorton/httpd-pr52774.patch +1: jorton, covener, druggeri, jim + +PATCHES PROPOSED TO BACKPORT FROM TRUNK: + [ New proposals should be added at the end of the list ] + + * mod_rewrite: Fix RewriteCond integer checks to be parsed correctly. + (PR 53023) + Patch: http://svn.apache.org/viewvc?view=revision&revision=1309602 + (applies cleanly to 2.4.x) + +1: nd + + * mod_ssl: Add support for Next Protocol Negotiation. + Trunk patch: + http://svn.apache.org/viewvc?view=revision&revision=1332643 + 2.4.x patch: + Trunk patch works. + +1: ben + sf says: Needs r1345599, too. + And wrowe's comment about the 2.2 patch is also valid for 2.4: + http://svn.apache.org/viewvc?view=revision&revision=1354823 + * ldap: Treat LDAP_UNAVAILABLE as a transient error with non-MS LDAP SDKs; seen with OpenLDAP against Novell eDirectory. trunk patch: http://svn.apache.org/viewvc?rev=1348036&view=rev -- 2.50.1