summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-28 09:21:49 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-28 09:21:49 +0000
commit87eb8726e51c2c2d71553209c0e60891b7168089 (patch)
tree32d8f47d3cbaaa407836e8b19433e36c3b277a5a
parent97664753c9f14b86c1834d9f61fffb7a3b0c7280 (diff)
merges r21739 from trunk into ruby_1_9_1.
* lib/cgi/core.rb (CGI.parse): generate only key on params hash if request have only key uri parameters. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--lib/cgi/core.rb2
-rw-r--r--test/cgi/test_cgi_core.rb2
3 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 29913d64ab..bb143a3a3e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jan 22 17:12:37 2009 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
+
+ * lib/cgi/core.rb (CGI.parse): generate only key on params hash
+ if request have only key uri parameters.
+ (ex. index.cgi?aaa&bbb=1 # params=>{:aaa=>[],:bbb=>["1"]})
+
+ * test/cgi/test_cgi_core.rb: fix test for key only params.
+
Thu Jan 22 16:29:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rubygems/installer.rb (Gem::Installer#initialize): fixed
diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb
index 779f326a19..95cf423d83 100644
--- a/lib/cgi/core.rb
+++ b/lib/cgi/core.rb
@@ -339,6 +339,8 @@ class CGI
key, value = pairs.split('=',2).collect{|v| CGI::unescape(v) }
if key && value
params.has_key?(key) ? params[key].push(value) : params[key] = [value]
+ elsif key
+ params[key]=[]
end
end
params.default=[].freeze
diff --git a/test/cgi/test_cgi_core.rb b/test/cgi/test_cgi_core.rb
index 97fda9d87c..fa86cf14cd 100644
--- a/test/cgi/test_cgi_core.rb
+++ b/test/cgi/test_cgi_core.rb
@@ -31,7 +31,7 @@ class CGICoreTest < Test::Unit::TestCase
}
ENV.update(@environ)
cgi = CGI.new
- assert_equal(["a","b","d"],cgi.keys.sort) if RUBY_VERSION>="1.9"
+ assert_equal(["a","b","c","d"],cgi.keys.sort) if RUBY_VERSION>="1.9"
assert_equal("",cgi["d"])
end