]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
updated protocols patch with latest changes and the missing NPN removal
authorStefan Eissing <icing@apache.org>
Wed, 2 Sep 2015 11:09:34 +0000 (11:09 +0000)
committerStefan Eissing <icing@apache.org>
Wed, 2 Sep 2015 11:09:34 +0000 (11:09 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1700766 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 8124d2d16dae19b277eda2a9ec7521f337ca3fca..fd17b33877e14f3fdea1bd547c5ca5edfecda961 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -293,7 +293,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1698116
                   http://svn.apache.org/r1698133
     All changes to files in modules/http2 need to be ignored.
-    2.4.x patch: https://raw.githubusercontent.com/icing/mod_h2/master/sandbox/httpd/patches/core-protocols.patch
+    v2: added r1698116, r1693918 to patch
+    v3: added changes to ap_array_index and ap_array_contains
+    2.4.x patch: https://raw.githubusercontent.com/icing/mod_h2/master/sandbox/httpd/patches/core-protocols-v3.patch
     +1: icing, 
  
   *) mod_socache_memcache: Add the 'MemcacheConnTTL' directive to control how