You are viewing a plain text version of this content. The canonical link for it is here.

Posted to cvs@httpd.apache.org by ji...@apache.org on 2019/03/13 17:58:03 UTC

svn commit: r1855447 - /httpd/httpd/branches/2.4.x/STATUS

Author: jim
Date: Wed Mar 13 17:58:03 2019
New Revision: 1855447

URL: http://svn.apache.org/viewvc?rev=1855447&view=rev
Log:
update patch

Modified:
    httpd/httpd/branches/2.4.x/STATUS

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1855447&r1=1855446&r2=1855447&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Mar 13 17:58:03 2019
@@ -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