From: Jeff Trawick <trawick@apache.org>
Date: Thu, 12 Apr 2007 15:16:33 +0000 (+0000)
Subject: merge fix to 39245?
X-Git-Tag: 2.2.5~286
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ab1891ae7a1da164171cb6aefb1f522b0e72cc4;p=thirdparty%2Fapache%2Fhttpd.git

merge fix to 39245?


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

diff --git a/STATUS b/STATUS
index e3207d9a51e..cdb2037f2a4 100644
--- a/STATUS
+++ b/STATUS
@@ -188,3 +188,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.2.x version of patch:
        Trunk version works
      +1: trawick
+
+   * HTTP proxy ProxyErrorOverride: Leave 1xx and 3xx responses alone.  Only
+     processing of error responses (4xx, 5xx) will be altered.  PR
+     39245.
+     Trunk version of patch:
+       http://svn.apache.org/viewvc?view=rev&revision=527969
+     2.2.x version of patch:
+       Trunk version works
+     +1: trawick