diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-04-18 15:43:07 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-04-18 15:43:07 +0000 |
| commit | 3b9bf64130df2512d058d841341d9a082493141e (patch) | |
| tree | 4003e2fc24ca5ae11c41a29087665eef2eb1e4d6 /actionpack/lib/action_controller/cgi_process.rb | |
| parent | c1611a703c5366d7a85a5283ba1d721cfb5be43a (diff) | |
| download | rails-3b9bf64130df2512d058d841341d9a082493141e.tar.gz rails-3b9bf64130df2512d058d841341d9a082493141e.tar.bz2 rails-3b9bf64130df2512d058d841341d9a082493141e.zip | |
Added support for web servers that use PATH_INFO instead of REQUEST_URI like IIS #1014 [BradG/Nicholas Seckar]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1211 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/cgi_process.rb')
| -rw-r--r-- | actionpack/lib/action_controller/cgi_process.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb index 4e3a1d270c..fb46c6d353 100644 --- a/actionpack/lib/action_controller/cgi_process.rb +++ b/actionpack/lib/action_controller/cgi_process.rb @@ -48,7 +48,11 @@ module ActionController #:nodoc: def query_string return @cgi.query_string unless @cgi.query_string.nil? || @cgi.query_string.empty? - parts = env['REQUEST_URI'].split('?') + unless env['REQUEST_URI'].nil? + parts = env['REQUEST_URI'].split('?') + else + return env['QUERY_STRING'] || '' + end parts.shift return parts.join('?') end |