]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Add another rev for mod_ssl TLSv1.3 buffering fix, and reset vote.
authorJoe Orton <jorton@apache.org>
Mon, 17 Aug 2020 12:53:28 +0000 (12:53 +0000)
committerJoe Orton <jorton@apache.org>
Mon, 17 Aug 2020 12:53:28 +0000 (12:53 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1880928 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 51d19a5c09d157e310f8941a9eeda5c51058a81f..4c309b9e11017c46f24dacbd629c77cf6b17faae 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -211,8 +211,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) mod_ssl: Support HTTP request body buffering with TLSv1.3.
      trunk patch: http://svn.apache.org/r1870095
                   http://svn.apache.org/r1870097
-     2.4.x patch: svn merge -c 1870095,1870097 ^/httpd/httpd/trunk .
-     +1: jorton, gbechis
+                  http://svn.apache.org/r1880927
+     2.4.x patch: svn merge --accept tf -c 1870095,1870097,1880927 ^/httpd/httpd/trunk .
+     +1: jorton, 
 
   *) mod_proxy: Add proxy check_trans() hook and allow mod_proxy_wtunnel
      to step out of the way of mod_proxy_http.