From: Colm MacCarthaigh Date: Mon, 23 Jan 2006 19:18:38 +0000 (+0000) Subject: Merge r241044 from trunk: X-Git-Tag: 2.0.56~95 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a41dd20b9db1564ba804e521216cd4e9fdecd3d;p=thirdparty%2Fapache%2Fhttpd.git 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 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@371629 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/CHANGES b/CHANGES index fe30da47af5..352c34d4852 100644 --- 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 ] + *) 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 c64fc968ac0..768596953a8 100644 --- 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 diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c index 4ddcfc020fb..9ef4e2ded88 100644 --- a/modules/proxy/proxy_ftp.c +++ b/modules/proxy/proxy_ftp.c @@ -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 "\n \n %s%s%s\n" - " \n \n" + " \n" " \n

Directory of " "%s/%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),