]> granicus.if.org Git - apache/commitdiff
Update backport proposal with latest trunk work
authorDaniel Ruggeri <druggeri@apache.org>
Sat, 4 Feb 2017 20:29:17 +0000 (20:29 +0000)
committerDaniel Ruggeri <druggeri@apache.org>
Sat, 4 Feb 2017 20:29:17 +0000 (20:29 +0000)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1781703 13f79535-47bb-0310-9956-ffa450edef68

STATUS

diff --git a/STATUS b/STATUS
index 0c29705066a5be80ef2fad4648fd7e9e9f504ec4..f5fe2713d66c33a8e2f5983155076ae26c5fee10 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -168,10 +168,14 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
                   http://svn.apache.org/r1776627 (shortened name + doc fix)
                   http://svn.apache.org/r1776674 (attribution moved to CHANGES)
                   http://svn.apache.org/r1776740 (attribution updated in mod_remotip.c)
-     2.4 patch (includes CHANGES):
+                  http://svn.apache.org/r1778268 (fix compiler warning)
+                  http://svn.apache.org/r1780725 (set buckets aside)
+                  http://svn.apache.org/r1781030 (fix strict GCC warning)
+                  http://svn.apache.org/r1781031 (reference the filter by handle)
+                  http://svn.apache.org/r1781701 (rework optional processing case)
+     2.4 convenience patch (includes CHANGES):
                   http://people.apache.org/~druggeri/patches/RemoteIPProxyProtocol.2.4.x.patch
      +1: druggeri, jim
-     ±0: jorton, not reviewed but please include r1781030 too
 
   *) mod_brotli: Backport of mod_brotli filter
      trunk patch: http://svn.apache.org/r1761714