From: Daniel Earl Poirier <poirier@apache.org>
Date: Wed, 8 Dec 2010 18:11:41 +0000 (+0000)
Subject: Vote, promote
X-Git-Tag: 2.2.18~261
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4a1fc16f56182386930acd33164af31c940fd774;p=thirdparty%2Fapache%2Fhttpd.git

Vote, promote

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

diff --git a/STATUS b/STATUS
index d49a89eb0f1..9d3ade93eb0 100644
--- a/STATUS
+++ b/STATUS
@@ -97,6 +97,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.2.x patch: trunk patch works
      +1: minfrin, jim, covener
 
+   * mod_proxy_connect: don't break proxy connections when EINTR is received 
+     during poll PR50220.
+     Trunk patch: http://svn.apache.org/viewvc?rev=1031551&view=rev
+     2.2.x patch: http://people.apache.org/~covener/patches/2.2.x-proxy_connect_eintr.diff
+     +1 covener, trawick, poirier
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -185,12 +191,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.2.x patch: http://people.apache.org/~covener/patches/2.2.x-autoindex_merge.diff
      +1 covener
     
-   * mod_proxy_connect: don't break proxy connections when EINTR is received 
-     during poll PR50220.
-     Trunk patch: http://svn.apache.org/viewvc?rev=1031551&view=rev
-     2.2.x patch: http://people.apache.org/~covener/patches/2.2.x-proxy_connect_eintr.diff
-     +1 covener, trawick
-
    * mod_userdir: support merge of "userdir disabled" or "userdir public_html"
      when userdir directives appear in vhost context. PR 44076
      Trunk patch: http://svn.apache.org/viewvc?rev=1042090&view=rev