You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ro...@apache.org on 2006/03/05 08:08:29 UTC
svn commit: r383291 - in /httpd/httpd/branches/fcgi-proxy-dev/modules/proxy:
mod_proxy_balancer.c mod_proxy_fcgi.c
Author: rooneg
Date: Sat Mar 4 23:08:28 2006
New Revision: 383291
URL: http://svn.apache.org/viewcvs?rev=383291&view=rev
Log:
Fix up the path info in the balancer backend just like we do in the
fcgi backend. This lets Rails apps work under a balancer setup without
any hacks to Rails itself.
* modules/proxy/mod_proxy_balancer.c
(proxy_balancer_canon): Set r->path_info based on the path we got
from parsing the URL.
* modules/proxy/mod_proxy_fcgi.c
(proxy_fcgi_canon): Remove the comment about balancer not setting
the path_info.
Modified:
httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_balancer.c
httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c
Modified: httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_balancer.c?rev=383291&r1=383290&r2=383291&view=diff
==============================================================================
--- httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_balancer.c Sat Mar 4 23:08:28 2006
@@ -71,6 +71,9 @@
r->filename = apr_pstrcat(r->pool, "proxy:balancer://", host,
"/", path, (search) ? "?" : "", (search) ? search : "", NULL);
+
+ r->path_info = apr_pstrcat(r->pool, "/", path, NULL);
+
return OK;
}
Modified: httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c?rev=383291&r1=383290&r2=383291&view=diff
==============================================================================
--- httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c (original)
+++ httpd/httpd/branches/fcgi-proxy-dev/modules/proxy/mod_proxy_fcgi.c Sat Mar 4 23:08:28 2006
@@ -113,11 +113,6 @@
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
"proxy: FCGI: set r->filename to %s", r->filename);
- /* XXX NOTE: this isn't ever going to be called if we're in a balancer
- * setup, so either we need someplace else to set this up, or the
- * balancer code needs to do the same thing. As things stand you
- * can't depend on the PATH_INFO being sent down to the back end. */
-
r->path_info = apr_pstrcat(r->pool, "/", path, NULL);
ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,