Move #query_string to AbstractRequest

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7727 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 10 insertions, 3 deletions

diff --git a/actionpack/lib/action_controller/cgi_process.rb b/actionpack/lib/action_controller/cgi_process.rb
index cfa6f6dc54..adc594f03e 100644
--- a/actionpack/lib/action_controller/cgi_process.rb
+++ b/actionpack/lib/action_controller/cgi_process.rb
@@ -55,10 +55,8 @@ module ActionController #:nodoc:
       qs = @cgi.query_string if @cgi.respond_to?(:query_string)
       if !qs.blank?
         qs
-      elsif uri = @env['REQUEST_URI']
-        uri.split('?', 2)[1] || ''
       else
-        @env['QUERY_STRING'] || ''
+        super
       end
     end
 
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 17f22864bd..68a5ea3701 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -205,6 +205,15 @@ module ActionController
       parts[0..-(tld_length+2)]
     end
 
+    # Return the query string, accounting for server idiosyncracies.
+    def query_string
+      if uri = @env['REQUEST_URI']
+        uri.split('?', 2)[1] || ''
+      else
+        @env['QUERY_STRING'] || ''
+      end
+    end
+
     # Return the request URI, accounting for server idiosyncracies.
     # WEBrick includes the full URL. IIS leaves REQUEST_URI blank.
     def request_uri