propose recent trunk revs

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

diff --git a/STATUS b/STATUS
index 15b83899896547600bb859a00be51ecef59f69a5..0f8372e01c70868035c54f51bdcd35412dfecb1b 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -180,6 +180,17 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1863635 ^/httpd/httpd/trunk .
      +1: jim, icing
 
+
+  *) core, proxy: remove request URL and headers from error docs
+     trunk: http://svn.apache.org/1864191
+     2.4.x: svn merge  -c 1864191 ^/httpd/httpd/trunk .
+     +1: covener
+
+  *) core, rewrite: Set PCRE_DOTALL by default
+     trunk: http://svn.apache.org/1864192
+     2.4.x: svn merge  -c 1864192 ^/httpd/httpd/trunk .
+     +1: covener
+
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]