From: Stefan Eissing <icing@apache.org>
Date: Wed, 2 Sep 2015 11:09:34 +0000 (+0000)
Subject: updated protocols patch with latest changes and the missing NPN removal
X-Git-Tag: 2.4.17~166
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2ccf6e66453a7727693f92ccfdc927ef841ea6d4;p=thirdparty%2Fapache%2Fhttpd.git

updated protocols patch with latest changes and the missing NPN removal

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1700766 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 8124d2d16da..fd17b33877e 100644
--- 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