]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
updated after incorporating change by ylavic
authorStefan Eissing <icing@apache.org>
Thu, 19 Nov 2015 16:10:37 +0000 (16:10 +0000)
committerStefan Eissing <icing@apache.org>
Thu, 19 Nov 2015 16:10:37 +0000 (16:10 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1715205 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 75e9e8e076790104b408d1043725b6990516e819..a24c5b3c62d2cc25410ee9ed309eb806a20c7cf8 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -167,11 +167,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1710419
                   http://svn.apache.org/r1710572
                   http://svn.apache.org/r1710583
+                  http://svn.apache.org/r1715023
                   + manual addition of "conn_rec *master;"
-     2.4.x patch: https://raw.githubusercontent.com/icing/mod_h2/master/sandbox/httpd/patches/2.4.17-protocols.patch
      branch mergeable to 2.4.x: ^/httpd/httpd/branches/2.4.17-protocols-changes
-     +1: icing, jim
-     ylavic: +1 with r1715023.
+     +1: icing, ylavic
+     before adding r1715023, jim was +1, retest?
 
   *) mod_ssl: For the "SSLStaplingReturnResponderErrors off" case, make sure
               to only staple responses with certificate status "good"