From: Jim Jagielski <jim@apache.org>
Date: Thu, 15 Feb 2007 15:04:01 +0000 (+0000)
Subject: Backport proposal:
X-Git-Tag: 2.2.5~316
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11ae671c349ca4447519bfe42d9b5c6ebd8b8716;p=thirdparty%2Fapache%2Fhttpd.git

Backport proposal:
  http://svn.apache.org/viewvc?view=rev&revision=507516
  PR: 11540


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

diff --git a/STATUS b/STATUS
index 5275fce76f9..18518972674 100644
--- a/STATUS
+++ b/STATUS
@@ -169,7 +169,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
    * mod_proxy_http: Handle request bodies larger than 2 GB by converting
      the Content-Length header of the request correctly.
-       PR 40883
+       PR: 40883
      http://svn.apache.org/viewvc?view=rev&revision=486320
      +1: trawick, rpluem
 
+   * mod_proxy: Various settings being ignored due to not merging *_set params
+       PR: 11540
+     http://svn.apache.org/viewvc?view=rev&revision=507516
+     +1: jim