From: Jim Jagielski <jim@apache.org>
Date: Fri, 15 Dec 2017 12:25:49 +0000 (+0000)
Subject: Handle uint*_t fields for some backports...
X-Git-Tag: 2.4.30~221
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6830e8f726ea01df78337a16bd27115e2aaf6ab2;p=apache

Handle uint*_t fields for some backports...


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

diff --git a/STATUS b/STATUS
index 946318ca3a..a2d33058a1 100644
--- a/STATUS
+++ b/STATUS
@@ -163,8 +163,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1790169 (rename "exception" directive)
                   http://svn.apache.org/r1790457 (Update directive name in err message)
                   http://svn.apache.org/r1806985
+                  http://svn.apache.org/r1818279
      2.4 convenience patch (includes CHANGES):
                   http://home.apache.org/~jim/patches/RemoteIPProxyProtocol.2.4-v2.patch
+                  http://svn.apache.org/r1818279
      +1: druggeri, jim
      ylavic: RemoteIPProxyProtocol* are documented as scoped to server config
              and virtual host, though using ap_server_conf makes them global
@@ -237,6 +239,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1810363
                   http://svn.apache.org/r1810365
                   http://svn.apache.org/r1810447
+                  http://svn.apache.org/r1818280
      2.4.x patch: trunk works (modulo CHANGES)
      +1: jim
      -1: steffenal: does not build on windows (uint8_t)
@@ -246,6 +249,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c r1818040  ^/httpd/httpd/trunk . 
      +1: 
 
+  *) mod_brotli.c: APR-ize uint values
+     trunk patch: http://svn.apache.org/r1818278
+     2.4.x patch: svn merge -c r1818278  ^/httpd/httpd/trunk . 
+     +1: 
+     
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]