From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 22 May 2015 07:53:00 +0000 (+0000)
Subject: Follow up to r1681006: promote the right lazy concensus.
X-Git-Tag: 2.2.30~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=148f023aa4fffba46d2d4b4e3592771d5892df15;p=thirdparty%2Fapache%2Fhttpd.git

Follow up to r1681006: promote the right lazy concensus.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1681024 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index b557673bdbd..4ab1e26b47a 100644
--- a/STATUS
+++ b/STATUS
@@ -101,14 +101,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_proxy: use the original (non absolute) form of the request-line's URI
-     for requests embedded in CONNECT payloads used to connect SSL backends via
-     a ProxyRemote forward-proxy. PR 55892.
-     trunk patch: http://svn.apache.org/r1665215
-                  http://svn.apache.org/r1665218 (CHANGES entry)
-     2.2.x patch: trunk works (modulo CHANGES)
-     +1: ylavic, wrowe
-
    * mod_authn_dbd: Fix lifetime of DB lookup entries independently of the
      selected DB engine.  PR 46421.
      trunk patch: http://svn.apache.org/r1663647
@@ -117,6 +109,11 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
                   (trunk works but the patch includes a CHANGES entry relative to 2.2.x only)
      +1: ylavic, rjung, wrowe
 
+   * mpm_winnt service.c: Accept utf-8 service names/descriptions for i18n.
+     trunk patches: http://svn.apache.org/r1611165
+                    http://svn.apache.org/r1611169
+     2.2.x patch: http://people.apache.org/~wrowe/httpd-2.2-utf8-servicename.patch
+     +1: wrowe, gsmith
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
@@ -139,11 +136,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      rjung: It seems most prefer the %{...}T variant. I'll switch to that.
      ylavic: OK, I merged the below proposal with this one. breser vote discared.
 
-   * mpm_winnt service.c: Accept utf-8 service names/descriptions for i18n.
-     trunk patches: http://svn.apache.org/r1611165
-                    http://svn.apache.org/r1611169
-     2.2.x patch: http://people.apache.org/~wrowe/httpd-2.2-utf8-servicename.patch
-     +1: wrowe, gsmith
+   * mod_proxy: use the original (non absolute) form of the request-line's URI
+     for requests embedded in CONNECT payloads used to connect SSL backends via
+     a ProxyRemote forward-proxy. PR 55892.
+     trunk patch: http://svn.apache.org/r1665215
+                  http://svn.apache.org/r1665218 (CHANGES entry)
+     2.2.x patch: trunk works (modulo CHANGES)
+     +1: ylavic, wrowe
 
 
 PATCHES/ISSUES THAT ARE STALLED