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

Posted to cvs@httpd.apache.org by jo...@apache.org on 2017/08/18 08:50:03 UTC

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

Author: jorton
Date: Fri Aug 18 08:50:03 2017
New Revision: 1805391

URL: http://svn.apache.org/viewvc?rev=1805391&view=rev
Log:
Merged.

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=1805391&r1=1805390&r2=1805391&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Aug 18 08:50:03 2017
@@ -222,11 +222,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.4.x patch: svn merge -c 1803420,1803454,1804090 ^/httpd/httpd/trunk .
      +1: icing +1: steffenal
 
-  *) mod_proxy: fix ProxyAddHeaders merging.
-     trunk patch: http://svn.apache.org/viewvc?rev=1805099&view=rev
-     2.4.x patch: trunk patch works
-     +1: jorton, rpluem, jim
-
   *) mod_watchdog/mod_proxy_hcheck: Now accept ms interval settings
      trunk patch: http://svn.apache.org/r1799435
                   http://svn.apache.org/r1799437