From: Jim Jagielski <jim@apache.org>
Date: Wed, 13 Mar 2019 17:58:03 +0000 (+0000)
Subject: update patch
X-Git-Tag: 2.4.39~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=141d9383b2c1a6400bdc22fa8b58f63568666e57;p=thirdparty%2Fapache%2Fhttpd.git

update patch


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

diff --git a/STATUS b/STATUS
index fe19074ea5f..52d0e1652e6 100644
--- a/STATUS
+++ b/STATUS
@@ -195,7 +195,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) modules/filters/config.m4: Make libxml2's inclusion of unicode/*.h files
      a non-fatal warning/error under maintainer-mode.
      trunk patch: http://svn.apache.org/r1850745
-     2.4.x patch: svn merge -c 1850745 ^/httpd/httpd/trunk .
+                  http://svn.apache.org/r1855446
+     2.4.x patch: svn merge -c 1850745,1855446 ^/httpd/httpd/trunk .
      +1: jim
 
   *) mod_proxy_http: forward 100-continue, and minimize race conditions when