Return-Path: 
 <cvs-return-29057-apmail-httpd-cvs-archive=httpd.apache.org@httpd.apache.org>
Delivered-To: apmail-httpd-cvs-archive@www.apache.org
Received: (qmail 84545 invoked from network); 12 Jan 2008 19:33:04 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 12 Jan 2008 19:33:04 -0000
Received: (qmail 37541 invoked by uid 500); 12 Jan 2008 19:32:53 -0000
Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org
Received: (qmail 37500 invoked by uid 500); 12 Jan 2008 19:32:53 -0000
Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
list-help: <mailto:cvs-help@httpd.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@httpd.apache.org>
List-Post: <mailto:cvs@httpd.apache.org>
List-Id: <cvs.httpd.apache.org>
Delivered-To: mailing list cvs@httpd.apache.org
Received: (qmail 37489 invoked by uid 99); 12 Jan 2008 19:32:53 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Jan 2008 11:32:53 -0800
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Jan 2008 19:32:26 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 26E6A1A9832; Sat, 12 Jan 2008 11:32:32 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r611466 - in /httpd/httpd/trunk: CHANGES
 modules/proxy/mod_proxy_ftp.c
Date: Sat, 12 Jan 2008 19:32:31 -0000
To: cvs@httpd.apache.org
From: niq@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080112193232.26E6A1A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: niq
Date: Sat Jan 12 11:32:24 2008
New Revision: 611466

URL: http://svn.apache.org/viewvc?rev=611466&view=rev
Log:
mod_proxy_ftp: Fix base for directory listings.
PR 27834

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=611466&r1=611465&r2=611466&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sat Jan 12 11:32:24 2008
@@ -2,15 +2,15 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) mod_proxy_ftp: Fix base for directory listings.
+     PR 27834 [Nick Kew]
+
   *) mod_proxy_http: Return HTTP status codes instead of apr_status_t
      values for errors encountered while forwarding the request body
      PR 44165 [Eric Covener]
 
   *) mod_logio: Provide optional function to allow modules to adjust the 
      bytes_in count [Eric Covener]
-     
-  *) mod_rewrite: Don't canonicalise URLs with [P,NE]
-     PR 43319 [<rahul sun.com>]
 
   *) mod_ssl: Added server name indication support (RFC 4366).
      PR 34607. [Kaspar Brand <asfbugz velox.ch>]

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c?rev=611466&r1=611465&r2=611466&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ftp.c Sat Jan 12 11:32:24 2008
@@ -314,6 +314,7 @@
         /* basedir is either "", or "/%2f" for the "squid %2f hack" */
         const char *basedir = "";  /* By default, path is relative to the $HOME dir */
         char *wildcard = NULL;
+        const char *escpath;
 
         /* Save "scheme://site" prefix without password */
         site = apr_uri_unparse(p, &f->r->parsed_uri, APR_URI_UNP_OMITPASSWORD | APR_URI_UNP_OMITPATHINFO);
@@ -350,13 +351,14 @@
         str = (basedir[0] != '\0') ? "<a href=\"/%2f/\">%2f</a>/" : "";
 
         /* print "ftp://host/" */
+        escpath = ap_escape_html(p, path);
         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"
                 " <body>\n  <h2>Directory of "
                 "<a href=\"/\">%s</a>/%s",
-                site, basedir, ap_escape_html(p, path),
-                site, str);
+                site, basedir, escpath, site, basedir, escpath, site, str);
 
         APR_BRIGADE_INSERT_TAIL(out, apr_bucket_pool_create(str, strlen(str),
                                                           p, c->bucket_alloc));