httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r1611319 - /httpd/httpd/branches/2.2.x/STATUS
Date Thu, 17 Jul 2014 10:52:03 GMT
Author: jorton
Date: Thu Jul 17 10:52:03 2014
New Revision: 1611319

URL: http://svn.apache.org/r1611319
Log:
Fooled by weird "svn merge" failing to fail... no this patch doesn't apply.

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=1611319&r1=1611318&r2=1611319&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Jul 17 10:52:03 2014
@@ -111,16 +111,16 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      +1: covener, ylavic, jorton
 
 
+PATCHES PROPOSED TO BACKPORT FROM TRUNK:
+  [ New proposals should be added at the end of the list ]
+
+
    * SECURITY: CVE-2014-0117 (cve.mitre.org)
      Fix crashing with mod_proxy Connection handling.
      trunk patch: http://svn.apache.org/r1610674
      2.4.x patch: http://svn.apache.org/r1610737 (simplified ver)
      2.2.x patch: 2.4 works
-     +1: covener, ylavic, jorton
-
-PATCHES PROPOSED TO BACKPORT FROM TRUNK:
-  [ New proposals should be added at the end of the list ]
-
+     +1: covener, ylavic
 
    * mod_proxy: Don't reuse a SSL backend connection whose SNI differs. PR 55782.
                 This may happen when ProxyPreserveHost is on and the proxy-worker



Mime
View raw message