]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Merge r241044 from trunk:
authorColm MacCarthaigh <colm@apache.org>
Mon, 23 Jan 2006 19:18:38 +0000 (19:18 +0000)
committerColm MacCarthaigh <colm@apache.org>
Mon, 23 Jan 2006 19:18:38 +0000 (19:18 +0000)
* Remove the base href tag from mod_proxy_ftp, as it breaks relative
  links for clients not using an Authorization header.

Submitted by: minfrin

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

CHANGES
STATUS
modules/proxy/proxy_ftp.c

diff --git a/CHANGES b/CHANGES
index fe30da47af56c011197ea7b3e0ae14ca3b22c46c..352c34d48525f6ac7e17b4803e067fddc1eaf557 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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.
diff --git a/STATUS b/STATUS
index c64fc968ac0b996ef3e48132d8635d586570f1ad..768596953a848a54b4a3945d71a729596536312c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -133,11 +133,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
          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
index 4ddcfc020fbc7a8d871a17c6c2fb33c881da84f1..9ef4e2ded8811120ec1a85dedb5850b756e5c1bc 100644 (file)
@@ -353,11 +353,10 @@ apr_status_t ap_proxy_send_dir_filter(ap_filter_t *f, apr_bucket_brigade *in)
         /* 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),