]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Three more TLSv1.3 changes.
authorJoe Orton <jorton@apache.org>
Tue, 18 Sep 2018 14:04:31 +0000 (14:04 +0000)
committerJoe Orton <jorton@apache.org>
Tue, 18 Sep 2018 14:04:31 +0000 (14:04 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1841230 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index b62f1ad18fea76d7daad3198fa114d3c6d2d13ea..d68e187ff284430b0c9f1bf53bcc994798019619 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -212,7 +212,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
              http://svn.apache.org/r1828790
              http://svn.apache.org/r1828791
              http://svn.apache.org/r1828792
-      2.4.x branch: ^/httpd/httpd/branches/tlsv1.3-for-2.4.x
+             http://svn.apache.org/r1840585
+             http://svn.apache.org/r1840710
+             http://svn.apache.org/r1841218
+      2.4.x branch: svn merge ^/httpd/httpd/branches/tlsv1.3-for-2.4.x
       +1: icing,
 
    *) mod_proxy_hcheck: Fix issues with TCP health checks. PR 61499