You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2014/07/14 01:21:33 UTC

svn commit: r1610321 - /httpd/httpd/branches/2.4.x/STATUS

Author: rjung
Date: Sun Jul 13 23:21:33 2014
New Revision: 1610321

URL: http://svn.apache.org/r1610321
Log:
Promote.

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

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1610321&r1=1610320&r2=1610321&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sun Jul 13 23:21:33 2014
@@ -122,6 +122,24 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      ylavic: does not depend on r1572092 or r1572655 and al above,
              these proposals can be backported in any order.
 
+   * mod_ssl: Fix issue with redirects to error documents when handling
+     SNI errors.
+     trunk patch: http://svn.apache.org/r1609914
+     2.4.x patch: Trunk patch works modulo CHANGES.
+     +1: trawick, minfrin, rjung
+
+   * mod_ssl: Set an error note for requests rejected due to
+     SSLStrictSNIVHostCheck
+     trunk patch: http://svn.apache.org/r1609936
+     2.4.x patch: Trunk patch works modulo CHANGES.
+     +1: trawick, minfrin, rjung
+
+   * core: Include any error notes set by modules in the canned error
+     response for 403 errors.
+     trunk patch: http://svn.apache.org/r1609938
+     2.4.x patch: Trunk patch works modulo CHANGES.
+     +1: trawick, minfrin, rjung
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -170,24 +188,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      note: depends on ap_shutdown_conn() from r1601185 above.
      +1: ylavic
 
-   * mod_ssl: Fix issue with redirects to error documents when handling
-     SNI errors.
-     trunk patch: http://svn.apache.org/r1609914
-     2.4.x patch: Trunk patch works modulo CHANGES.
-     +1: trawick, minfrin, rjung
-
-   * mod_ssl: Set an error note for requests rejected due to
-     SSLStrictSNIVHostCheck
-     trunk patch: http://svn.apache.org/r1609936
-     2.4.x patch: Trunk patch works modulo CHANGES.
-     +1: trawick, minfrin, rjung
-
-   * core: Include any error notes set by modules in the canned error
-     response for 403 errors.
-     trunk patch: http://svn.apache.org/r1609938
-     2.4.x patch: Trunk patch works modulo CHANGES.
-     +1: trawick, minfrin, rjung
-
    * mod_proxy_ajp: Forward local IP address as a custom request attribute
      like we already do for the remote port.
      Both were forgotten in the original AJP 13 spec