* Resolve conflicts that came up after we backported another proxy fix. The

  "new" patch is only a rediff without these conflicts.

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

diff --git a/STATUS b/STATUS
index 5609c6f0a15aac2bbe1fcf33113ef3168685e266..00824d4b7e18618ac3e2336d36f69312282539d4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -163,7 +163,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       http://svn.apache.org/viewvc?view=rev&revision=605314
       http://svn.apache.org/viewvc?view=rev&revision=605838
     Backport version for 2.2.x of patch:
-      http://people.apache.org/~jim/patches/proxy-ssl-44026-patch.txt
+      http://people.apache.org/~rpluem/patches/proxy-ssl-44026-patch.txt
    +1: jim, rpluem
 
  * mod_proxy:  In the case that we fail to read the response line