- postpoing http2 backport

- adding core fix for ap_escape_quotes() on huge strings.
[skip ci]

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

diff --git a/STATUS b/STATUS
index cf831b426e7090b851df807d84b9a486c3256d73..b19275fbb05a3e5f3eeb1cc9604eec78c988dcd1 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -174,6 +174,19 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-2.4-authn-expr.patch
      +1: minfrin, jim,
 
+  *) mod_lua: Don't skip apr_global_mutex_child_init() if !APR_HAS_THREADS
+     trunk patch: https://svn.apache.org/r1898453
+     2.4.x patch: svn merge -c 1898453 ^/httpd/httpd/trunk .
+     +1: jaillect36
+
+  *) core: make ap_escape_quotes() work correctly on strings
+     with more than MAX_INT/2 characters, counting quotes double.
+     2.4.x patch: svn merge -c 1899609 ^/httpd/httpd/trunk .
+     +1: icing
+
+PATCHES/ISSUES THAT ARE BEING WORKED
+  [ New entries should be added at the START of the list ]
+
   *) mod_http2: sync with trunk
      - Fixed an issue since 1.15.24 that "Server" headers in proxied requests
        were overwritten instead of preserved. [PR by @daum3ns]
@@ -221,14 +234,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
        PR: https://patch-diff.githubusercontent.com/raw/apache/httpd/pull/275.diff
      +1: icing, jim,
 
-  *) mod_lua: Don't skip apr_global_mutex_child_init() if !APR_HAS_THREADS
-     trunk patch: https://svn.apache.org/r1898453
-     2.4.x patch: svn merge -c 1898453 ^/httpd/httpd/trunk .
-     +1: jaillect36
-
-PATCHES/ISSUES THAT ARE BEING WORKED
-  [ New entries should be added at the START of the list ]
-
   *) mod_xml2enc: Correctly handle Microsoft OOXML documents.  PR 64339
      trunk patch: http://svn.apache.org/r1884505
      2.4.x patch: svn merge -c 1884505 ^/httpd/httpd/trunk .