updated backport proposal for protocols+mod_h2, updated patches

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

diff --git a/STATUS b/STATUS
index 1f5fc0b5038e368661d2ef03f1f235aa839bf60d..11e18ef89f74ea675f787081be2e39362f826020 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -292,10 +292,15 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1693918
                   http://svn.apache.org/r1698116
                   http://svn.apache.org/r1698133
+                  http://svn.apache.org/r1694950
+                  http://svn.apache.org/1700968
+                  http://svn.apache.org/1701005
+                  http://svn.apache.org/1701145
+                  http://svn.apache.org/1701178
      All changes to files in modules/http2 need to be ignored.
      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
+     2.4.x patch: https://raw.githubusercontent.com/icing/mod_h2/master/sandbox/httpd/patches/core-protocols-v4.patch
      +1: icing
 
   *) mod_h2: add HTTP/2 support to httpd, depends on core/mod_ssl changes above
@@ -343,7 +348,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1700275
                   http://svn.apache.org/r1700514
                   http://svn.apache.org/r1700777
-     2.4.x patch: https://raw.githubusercontent.com/icing/mod_h2/master/sandbox/httpd/patches/h2-only-v3.patch
+                  http://svn.apache.org/1700917
+                  http://svn.apache.org/1700925
+                  http://svn.apache.org/1701204
+     2.4.x patch for this and core/mod_ssl: https://raw.githubusercontent.com/icing/mod_h2/master/sandbox/httpd/patches/core-h2-all-in-one-v4.patch
      +1: icing