From: Eric Covener <covener@apache.org>
Date: Fri, 2 Aug 2019 01:47:02 +0000 (+0000)
Subject: propose recent trunk revs
X-Git-Tag: 2.4.40~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f22c13d4366006976fb3579d30659da50dc30d88;p=thirdparty%2Fapache%2Fhttpd.git

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 15b83899896..0f8372e01c7 100644
--- 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 ]