diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-12-08 04:40:24 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-12-08 04:40:24 +0000 |
| commit | c140e80fc4ca438cd966ec3b2453cb7bef91482b (patch) | |
| tree | 780e0fab4ca752a64588f1e0a4d27db889988bd3 /actionpack/lib | |
| parent | c1537e89f89d1460e3b0fb0dc87d2a310afa3cbc (diff) | |
| download | rails-c140e80fc4ca438cd966ec3b2453cb7bef91482b.tar.gz rails-c140e80fc4ca438cd966ec3b2453cb7bef91482b.tar.bz2 rails-c140e80fc4ca438cd966ec3b2453cb7bef91482b.zip | |
More robust relative url root discovery for SCGI compatibility. This solves the 'SCGI routes problem' -- you no longer need to prefix all your routes with the name of the SCGI mountpoint. References #3070.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3237 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index 57b7eea366..7203f4b789 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -169,7 +169,8 @@ module ActionController # Returns the path minus the web server relative installation directory. # This method returns nil unless the web server is apache. def relative_url_root - @@relative_url_root ||= server_software == 'apache' ? File.dirname(env["SCRIPT_NAME"].to_s).gsub(/(^\.$|^\/$)/, '') : '' + @@relative_url_root ||= server_software == 'apache' ? env["SCRIPT_NAME"].to_s.sub(/\/dispatch\.(fcgi|rb|cgi)$/, '') : '' + end # Returns the port number of this request as an integer. |