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

Posted to cvs@httpd.apache.org by rp...@apache.org on 2008/05/13 23:01:35 UTC

svn commit: r656009 - /httpd/httpd/branches/2.2.x/STATUS

Author: rpluem
Date: Tue May 13 14:01:35 2008
New Revision: 656009

URL: http://svn.apache.org/viewvc?rev=656009&view=rev
Log:
* Resolve conflicts that came up after we backported another proxy fix. The
  "new" patch is only a rediff without these conflicts.

Modified:
    httpd/httpd/branches/2.2.x/STATUS

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=656009&r1=656008&r2=656009&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue May 13 14:01:35 2008
@@ -163,7 +163,7 @@
       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