From 3b9bf64130df2512d058d841341d9a082493141e Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 18 Apr 2005 15:43:07 +0000 Subject: 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 --- actionpack/lib/action_controller/cgi_process.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_controller/cgi_process.rb') 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 -- cgit v1.2.3