From: Yann Ylavic Date: Thu, 5 Apr 2018 13:32:12 +0000 (+0000) Subject: Promote. X-Git-Tag: 2.4.34~243 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b497f1ac09108ca8376752968b355f21eb2e776;p=apache Promote. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1828432 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 3038e8b50a..3a0cd727e1 100644 --- 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