summary refs log tree commit
path: root/lib/rack/request.rb
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2015-04-05 23:38:19 -0300
committerAaron Patterson <aaron.patterson@gmail.com>2015-06-17 11:55:59 -0700
commit75c65fbb3b4a907ef3ebf5e97d0270918607a357 (patch)
tree0b9edcf4d5b0f18bcc215442e5b572311607975c /lib/rack/request.rb
parentb515722c2c1506274c5a862c4d6a2bbc079296e6 (diff)
downloadrack-75c65fbb3b4a907ef3ebf5e97d0270918607a357.tar.gz
Merge pull request #781 from Nyoho/fix-separator-semicolon-GET
Fix semicolons as separators for GET
Diffstat (limited to 'lib/rack/request.rb')
-rw-r--r--lib/rack/request.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/rack/request.rb b/lib/rack/request.rb
index e6e46e9d..d02a1f36 100644
--- a/lib/rack/request.rb
+++ b/lib/rack/request.rb
@@ -188,7 +188,7 @@ module Rack
       if @env["rack.request.query_string"] == query_string
         @env["rack.request.query_hash"]
       else
-        p = parse_query(query_string)
+        p = parse_query(query_string, '&;')
         @env["rack.request.query_string"] = query_string
         @env["rack.request.query_hash"]   = p
       end
@@ -212,7 +212,7 @@ module Rack
           form_vars.slice!(-1) if form_vars[-1] == ?\0
 
           @env["rack.request.form_vars"] = form_vars
-          @env["rack.request.form_hash"] = parse_query(form_vars)
+          @env["rack.request.form_hash"] = parse_query(form_vars, '&')
 
           @env["rack.input"].rewind
         end
@@ -365,8 +365,8 @@ module Rack
         ip_addresses.reject { |ip| trusted_proxy?(ip) }
       end
 
-      def parse_query(qs)
-        Utils.parse_nested_query(qs, '&')
+      def parse_query(qs, d)
+        Utils.parse_nested_query(qs, d)
       end
 
       def parse_multipart(env)