aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-03-01 17:26:52 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-03-01 17:26:52 +0000
commitcaf8976ce786a1d6dca69a448da394dbddd53f12 (patch)
tree98b470499b3e0c9c55bcb4ad50ef6356b675d9ed /actionpack
parentbc05cb18555582924fa398086ae78c1a11a108a5 (diff)
downloadrails-caf8976ce786a1d6dca69a448da394dbddd53f12.tar.gz
rails-caf8976ce786a1d6dca69a448da394dbddd53f12.tar.bz2
rails-caf8976ce786a1d6dca69a448da394dbddd53f12.zip
Made path work for lighttpd again as it uses an empty string where Apache returns nil
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@820 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
-rwxr-xr-xactionpack/lib/action_controller/request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 75b7c62378..46080b1318 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -90,7 +90,7 @@ module ActionController
end
def path
- path = path_info ? path_info : ( request_uri ? request_uri.split('?').first : '' )
+ (path_info && !path_info.empty?) ? path_info : (request_uri ? request_uri.split('?').first : '')
end
def port