You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2014/04/17 11:04:12 UTC

svn commit: r1588179 - in /httpd/httpd/branches/2.4.x: ./ STATUS

Author: jorton
Date: Thu Apr 17 09:04:12 2014
New Revision: 1588179

URL: http://svn.apache.org/r1588179
Log:
Vote, promote.

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/STATUS

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1587255

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1588179&r1=1588178&r2=1588179&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Apr 17 09:04:12 2014
@@ -106,6 +106,17 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4.x patch: trunk patch works, modulo CHANGES
     +1: minfrin, jim, ylavic
 
+   * mod_ssl: only read "active" values from the key_files array (PR 56306)
+     trunk patch: https://svn.apache.org/r1585918
+     2.4.x patch: trunk patch works (modulo CHANGES)
+     +1: kbrand, ylavic, jorton
+
+   * mod_ssl: reverse the order when merging global and vhost-level config
+     arrays (PR 56353)
+     trunk patch: https://svn.apache.org/r1585919
+     2.4.x patch: trunk patch works (modulo CHANGES)
+     +1: kbrand, ylavic, jorton
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -215,18 +226,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      (also addresses PR 56241)
      trunk patch: https://svn.apache.org/r1585090
      2.4.x patch: trunk patch works (modulo CHANGES)
-     +1: kbrand
-
-   * mod_ssl: only read "active" values from the key_files array (PR 56306)
-     trunk patch: https://svn.apache.org/r1585918
-     2.4.x patch: trunk patch works (modulo CHANGES)
-     +1: kbrand, ylavic
-
-   * mod_ssl: reverse the order when merging global and vhost-level config
-     arrays (PR 56353)
-     trunk patch: https://svn.apache.org/r1585919
-     2.4.x patch: trunk patch works (modulo CHANGES)
-     +1: kbrand, ylavic
+     +1: kbrand, jorton
 
    * core: synch with trunk
        - follow-up to r813376: finish reverting r808965 (ServerTokens set foo)