You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2008/09/17 16:21:42 UTC
svn commit: r696315 - in /httpd/httpd/branches/2.2.x: ./ STATUS docs/
modules/proxy/mod_proxy_ftp.c support/ab.c support/suexec.c
Author: jim
Date: Wed Sep 17 07:21:39 2008
New Revision: 696315
URL: http://svn.apache.org/viewvc?rev=696315&view=rev
Log:
Merge r681190 from trunk:
* Construct a site in the reverse proxy case when there is non.
Submitted by: rpluem
Reviewed by: jim
Modified:
httpd/httpd/branches/2.2.x/ (props changed)
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/docs/ (props changed)
httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ftp.c
httpd/httpd/branches/2.2.x/support/ab.c (props changed)
httpd/httpd/branches/2.2.x/support/suexec.c (props changed)
Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 17 07:21:39 2008
@@ -1 +1 @@
-/httpd/httpd/trunk:647395,660461,660566,664330,678761,682369,683626,685112,686805,686809,687099,687754
+/httpd/httpd/trunk:647395,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=696315&r1=696314&r2=696315&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Wed Sep 17 07:21:39 2008
@@ -92,14 +92,6 @@
http://svn.apache.org/viewvc?rev=639010&view=rev (mmn)
+1: niq, rpluem, mturk
- * mod_proxy_ftp: Build a correct Base HRef for directory listings in the
- reverse proxy case.
- Trunk version of patch:
- http://svn.apache.org/viewvc?rev=681190&view=rev
- Backport version for 2.2.x of patch:
- Trunk version of patch works
- +1: rpluem, jim, jerenkrantz
-
* mod_proxy: Add the possibility to set a separate connection timeout for
backend workers.
PR: 45445
Propchange: httpd/httpd/branches/2.2.x/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 17 07:21:39 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/docs:647395,660461,660566,664330,675610,678761,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325
+/httpd/httpd/trunk/docs:647395,660461,660566,664330,675610,678761,681190,682369,683626,684351,685112,686549,686805,686809,687099,687754,692325
Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ftp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ftp.c?rev=696315&r1=696314&r2=696315&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ftp.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ftp.c Wed Sep 17 07:21:39 2008
@@ -318,6 +318,13 @@
/* Save "scheme://site" prefix without password */
site = apr_uri_unparse(p, &f->r->parsed_uri, APR_URI_UNP_OMITPASSWORD | APR_URI_UNP_OMITPATHINFO);
+ /*
+ * In the reverse proxy case we usually have no site. So contruct
+ * one.
+ */
+ if ((*site == '\0') && (r->proxyreq == PROXYREQ_REVERSE)) {
+ site = ap_construct_url(p, "", r);
+ }
/* ... and path without query args */
path = apr_uri_unparse(p, &f->r->parsed_uri, APR_URI_UNP_OMITSITEPART | APR_URI_UNP_OMITQUERY);
Propchange: httpd/httpd/branches/2.2.x/support/ab.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 17 07:21:39 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/support/ab.c:83751-655654,657433,660461,660566,664330,678761,682369,683626,685112,686805,686809,687099,687754
+/httpd/httpd/trunk/support/ab.c:83751-655654,657433,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754
Propchange: httpd/httpd/branches/2.2.x/support/suexec.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 17 07:21:39 2008
@@ -1 +1 @@
-/httpd/httpd/trunk/support/suexec.c:647395,655711,660461,660566,664330,678761,682369,683626,685112,686805,686809,687099,687754
+/httpd/httpd/trunk/support/suexec.c:647395,655711,660461,660566,664330,678761,681190,682369,683626,685112,686805,686809,687099,687754