aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/cgi_process.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller/cgi_process.rb')
-rw-r--r--actionpack/lib/action_controller/cgi_process.rb6
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