From 57346b80c0bee96700c5dee98d23e20a816b5765 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 28 Jan 2009 09:21:49 +0000 Subject: 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@21825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ lib/cgi/core.rb | 2 ++ test/cgi/test_cgi_core.rb | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 29913d64a..bb143a3a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Thu Jan 22 17:12:37 2009 Takeyuki FUJIOKA + + * 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 * lib/rubygems/installer.rb (Gem::Installer#initialize): fixed diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb index 779f326a1..95cf423d8 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 97fda9d87..fa86cf14c 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 -- cgit