You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by po...@apache.org on 2010/12/08 19:11:41 UTC

svn commit: r1043566 - /httpd/httpd/branches/2.2.x/STATUS

Author: poirier
Date: Wed Dec  8 18:11:41 2010
New Revision: 1043566

URL: http://svn.apache.org/viewvc?rev=1043566&view=rev
Log:
Vote, promote

Modified:
    httpd/httpd/branches/2.2.x/STATUS

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1043566&r1=1043565&r2=1043566&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Dec  8 18:11:41 2010
@@ -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