You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/04/05 13:32:12 UTC

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

Author: ylavic
Date: Thu Apr  5 13:32:12 2018
New Revision: 1828432

URL: http://svn.apache.org/viewvc?rev=1828432&view=rev
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=1828432&r1=1828431&r2=1828432&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Apr  5 13:32:12 2018
@@ -165,6 +165,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1818802,1818825 ^/httpd/httpd/trunk .
      +1: jailletc36, jorton, ylavic
 
+  *) mod_ssl: Use 'ap_log_rerror()' instead of 'ap_log_error()' consistently
+     PR 62003
+     trunk patch: http://svn.apache.org/r1827865
+     2.4.x patch: svn merge -c 1827865 ^/httpd/httpd/trunk .
+     +1: jailletc36, jorton, ylavic
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -265,12 +271,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/ssl-policy.patch
      +1: icing
 
-  *) mod_ssl: Use 'ap_log_rerror()' instead of 'ap_log_error()' consistently
-     PR 62003
-     trunk patch: http://svn.apache.org/r1827865
-     2.4.x patch: svn merge -c 1827865 ^/httpd/httpd/trunk .
-     +1: jailletc36, jorton, ylavic
-
   *) mod_http2: normalize trace2 logging of http2 unencrypted connection
      upgrades.
      trunk patch: http://svn.apache.org/r1828210