From 11b5f8f7a1c3451bbb7e2edf215edb5d8e3cf27d Mon Sep 17 00:00:00 2001
From: Tobias Pfeiffer <pragtob@gmail.com>
Date: Tue, 21 Jul 2020 08:59:29 +0200
Subject: [PATCH] Parsing behavior change from foo[] to "foo" => []

Pending discussion in #1696 and if merged also fixes #1696
---
 lib/rack/query_parser.rb | 2 +-
 test/spec_utils.rb       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/rack/query_parser.rb b/lib/rack/query_parser.rb
index dbbb18e5a..cbde13cfd 100644
--- a/lib/rack/query_parser.rb
+++ b/lib/rack/query_parser.rb
@@ -102,7 +102,7 @@ def normalize_params(params, name, v, depth)
       elsif after == "[]"
         params[k] ||= []
         raise ParameterTypeError, "expected Array (got #{params[k].class.name}) for param `#{k}'" unless params[k].is_a?(Array)
-        params[k] << v
+        params[k] << v unless v.nil?
       elsif after =~ %r(^\[\]\[([^\[\]]+)\]$) || after =~ %r(^\[\](.+)$)
         child_key = $1
         params[k] ||= []
diff --git a/test/spec_utils.rb b/test/spec_utils.rb
index 428abbfd7..7651edbee 100644
--- a/test/spec_utils.rb
+++ b/test/spec_utils.rb
@@ -162,7 +162,7 @@ def assert_nested_query(exp, act)
       must_equal "pid=1234" => "1023", "a" => "b"
 
     Rack::Utils.parse_nested_query("foo[]").
-      must_equal "foo" => [nil]
+      must_equal "foo" => []
     Rack::Utils.parse_nested_query("foo[]=").
       must_equal "foo" => [""]
     Rack::Utils.parse_nested_query("foo[]=bar").