propose

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

diff --git a/STATUS b/STATUS
index 53f2aef9dddc4684bc46eed66c5679fd3c517a9e..5edc5e46e2996a755e0c9b73d3e17f1ff2ea018b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -193,7 +193,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      trunk patch: http://svn.apache.org/r1872036
                   http://svn.apache.org/r1872093
                   http://svn.apache.org/r1872102
-     2.4.x patch: svn merge -c r1872036,1872093,1872102 ^/httpd/httpd/trunk
+     2.4.x patch: svn merge -c r1872036,1872093,1872102 ^/httpd/httpd/trunk .
      +1: minfrin, jim (inspection)
 
   *) Add support for cross compiling to apxs. If apxs is being executed from somewhere
@@ -201,9 +201,26 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      Without this, apxs would fail to find config_vars.mk and exit.
      trunk patch: http://svn.apache.org/r1872042
                   http://svn.apache.org/r1872062
-     2.4.x patch: svn merge -c 1872042,1872062 ^/httpd/httpd/trunk
+     2.4.x patch: svn merge -c 1872042,1872062 ^/httpd/httpd/trunk .
      +1: minfrin, jim
 
+  *) trap mod_proxy_ftp errors
+     trunk patch: http://svn.apache.org/r1873745
+     2.4.x patch: svn merge -c 1873745 ^/httpd/httpd/trunk .
+     +1: covener
+
+  *) factor out default regex flags:
+     trunk patch: http://svn.apache.org/r1873747
+     2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-reg_default.diff
+         (MMN, ap_regex.h conflicts)
+     +1: covener
+
+  *) factor out chunked TE checks
+     trunk patch: http://svn.apache.org/r1873748
+     2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-chunk.diff
+         (conflicts)
+     +1: covener
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]