summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-31 13:05:39 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-31 13:05:39 +0000
commiteb12792cdb918cfaefae43a17d8902823aa342bd (patch)
treeaa71fba052f87c818aaaf75023e6d25c35c4e279
parent751e32b705c87796ab2e609216687ae5e96cc2d6 (diff)
merges r24840 and r24841 from trunk into ruby_1_9_1.
-- * lib/net/http.rb (Net::HTTPHeader::encode_kvpair): also call to_s to k. A patch from swdyh <youhei@gmail.com> http://github.com/swdyh/ruby/tree/c847f43c2ccb679b9ff728f8b1b16c6ceeb57f39 git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25598 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/net/http.rb2
-rw-r--r--version.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d1adeec4e..861cbbbe0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Sep 11 10:38:33 2009 URABE Shyouhei <shyouhei@ruby-lang.org>
+
+ * lib/net/http.rb (Net::HTTPHeader::encode_kvpair): also call to_s
+ to k. A patch from swdyh <youhei@gmail.com>
+ http://github.com/swdyh/ruby/tree/c847f43c2ccb679b9ff728f8b1b16c6ceeb57f39
+
Fri Sep 11 09:45:11 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* dln.c (aix_loaderror): get rid of using uninitialized value in the
diff --git a/lib/net/http.rb b/lib/net/http.rb
index d2a97de8d..8fb08870e 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1522,7 +1522,7 @@ module Net #:nodoc:
alias form_data= set_form_data
def encode_kvpair(k, vs)
- Array(vs).map {|v| "#{urlencode(k)}=#{urlencode(v.to_s)}" }
+ Array(vs).map {|v| "#{urlencode(k.to_s)}=#{urlencode(v.to_s)}" }
end
private :encode_kvpair
diff --git a/version.h b/version.h
index 2fd295041..af014851a 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 323
+#define RUBY_PATCHLEVEL 324
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1