summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 d1adeec4e0..861cbbbe0d 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 d2a97de8d4..8fb08870e8 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 2fd295041b..af014851ae 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