]> granicus.if.org Git - apache/commitdiff
Promote.
authorYann Ylavic <ylavic@apache.org>
Thu, 5 Apr 2018 13:32:12 +0000 (13:32 +0000)
committerYann Ylavic <ylavic@apache.org>
Thu, 5 Apr 2018 13:32:12 +0000 (13:32 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828432 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 3038e8b50a148dd93f7eba472f16252f0661ecd2..3a0cd727e1d106691f0b1a6870d5dc262ae152c5 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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