0
@@ -396,7 +396,7 @@ module Merb
0
     class << self
0
       
0
       # ==== Parameters
0
-      # value<Array, Hash, ~to_s>:: The value for the query string.
0
+      # value<Array, Hash, Dictionary ~to_s>:: The value for the query string.
0
       # prefix<~to_s>:: The prefix to add to the query string keys.
0
       #
0
       # ==== Returns
0
@@ -420,7 +420,7 @@ module Merb
0
           value.map { |v|
0
             params_to_query_string(v, "#{prefix}[]")
0
           } * "&"
0
-        when Hash
0
+        when Hash, Dictionary
0
           value.map { |k, v|
0
             params_to_query_string(v, prefix ? "#{prefix}[#{Merb::Request.escape(k)}]" : Merb::Request.escape(k))
0
           } * "&"
0
@@ -454,18 +454,21 @@ module Merb
0
       # ==== Parameters
0
       # qs<String>:: The query string.
0
       # d<String>:: The query string divider. Defaults to "&".
0
+      # preserve_order<Boolean>:: Preserve order of args. Defaults to false.
0
       #
0
       # ==== Returns
0
-      # Mash:: The parsed query string.
0
+      # Mash:: The parsed query string (Dictionary if preserve_order is set).
0
       #
0
       # ==== Examples
0
       #   query_parse("bar=nik&post[body]=heya")
0
       #     # => { :bar => "nik", :post => { :body => "heya" } }
0
-      def query_parse(qs, d = '&;')
0
-        (qs||'').split(/[#{d}] */n).inject({}) { |h,p| 
0
+      def query_parse(qs, d = '&;', preserve_order = false)
0
+        qh = preserve_order ? Dictionary.new : {}
0
+        (qs||'').split(/[#{d}] */n).inject(qh) { |h,p| 
0
           key, value = unescape(p).split('=',2)
0
           normalize_params(h, key, value)
0
-        }.to_mash
0
+        }
0
+        preserve_order ? qh : qh.to_mash
0
       end
0
     
0
       NAME_REGEX = /Content-Disposition:.* name="?([^\";]*)"?/ni.freeze

0
@@ -99,9 +99,8 @@ module Merb
0
       def dispatch_to(controller_klass, action, params = {}, env = {}, &blk)
0
         action = action.to_s
0
         request_body = { :post_body => env[:post_body], :req => env[:req] }
0
-        request = fake_request(env.merge(
0
-          :query_string => Merb::Request.params_to_query_string(params)), request_body)
0
-
0
+        env = env.merge(:query_string => Merb::Request.params_to_query_string(params)) unless env.key?('QUERY_STRING')
0
+        request = fake_request(env, request_body)
0
         dispatch_request(request, controller_klass, action, &blk)
0
       end
0