You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2006/01/23 20:18:44 UTC
svn commit: r371629 - in /httpd/httpd/branches/2.0.x: CHANGES STATUS
modules/proxy/proxy_ftp.c
Author: colm
Date: Mon Jan 23 11:18:38 2006
New Revision: 371629
URL: http://svn.apache.org/viewcvs?rev=371629&view=rev
Log:
Merge r241044 from trunk:
* Remove the base href tag from mod_proxy_ftp, as it breaks relative
links for clients not using an Authorization header.
Submitted by: minfrin
Modified:
httpd/httpd/branches/2.0.x/CHANGES
httpd/httpd/branches/2.0.x/STATUS
httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c
Modified: httpd/httpd/branches/2.0.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?rev=371629&r1=371628&r2=371629&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.0.x/CHANGES [utf-8] Mon Jan 23 11:18:38 2006
@@ -1,6 +1,10 @@
-*- coding: utf-8 -*-
Changes with Apache 2.0.56
+ *) Remove the base href tag from mod_proxy_ftp, as it breaks relative
+ links for clients not using an Authorization header. [Graham Leggett,
+ Jon Snow <jsnow27 gatesec.net>]
+
*) http_request.c: Add missing va_end call. [André Malo]
*) Add httxt2dbm to support/ for creating RewriteMap DBM Files.
Modified: httpd/httpd/branches/2.0.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?rev=371629&r1=371628&r2=371629&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Mon Jan 23 11:18:38 2006
@@ -133,11 +133,6 @@
http://svn.apache.org/viewcvs?view=rev&rev=154319
+1: stoddard, striker, wrowe (as corrected in subsequent patches)
- *) Remove the base href tag from mod_proxy_ftp, as it breaks relative
- links for clients not using an Authorization header.
- modules/proxy/mod_proxy_ftp.c: r231044
- +1: minfrin, jim, nd
-
*) mod_cache: Fix handling of 'Vary: *". PR 16125.
Trunk: r180341
2.0.x Patch: http://issues.apache.org/bugzilla/attachment.cgi?id=15297
Modified: httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c?rev=371629&r1=371628&r2=371629&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c (original)
+++ httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c Mon Jan 23 11:18:38 2006
@@ -353,11 +353,10 @@
/* print "ftp://host/" */
str = apr_psprintf(p, DOCTYPE_HTML_3_2
"<html>\n <head>\n <title>%s%s%s</title>\n"
- " <base href=\"%s%s%s\">\n </head>\n"
+ " </head>\n"
" <body>\n <h2>Directory of "
"<a href=\"/\">%s</a>/%s",
site, basedir, ap_escape_html(p, path),
- site, basedir, ap_escape_uri(p, path),
site, str);
APR_BRIGADE_INSERT_TAIL(out, apr_bucket_pool_create(str, strlen(str),