From: Joe Orton <jorton@apache.org>
Date: Fri, 18 Aug 2017 08:50:03 +0000 (+0000)
Subject: Merged.
X-Git-Tag: 2.4.28~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a71a70d0c463f14ed612616952aff14d5e1cfe1;p=thirdparty%2Fapache%2Fhttpd.git

Merged.

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

diff --git a/STATUS b/STATUS
index fd981b3a593..43cf126bf9a 100644
--- a/STATUS
+++ b/STATUS
@@ -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