Commit 708b0ebf authored by Colm MacCarthaigh's avatar Colm MacCarthaigh
Browse files

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
parent e8a154e6

CHANGES

+4 −0
Changes for CHANGES: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line 
                                                         -*- 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.


































STATUS



+0
−5



























Changes for STATUS: 0 added lines, 5 removed lines.



Original line number
Diff line number
Diff line







@@ -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


































modules/proxy/proxy_ftp.c



+1
−2



























Changes for modules/proxy/proxy_ftp.c: 1 added line, 2 removed lines.



Original line number
Diff line number
Diff line







@@ -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),