summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-13 20:30:46 +0000
committermarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-13 20:30:46 +0000
commita0c569a378389e58b5f54389acf3a83a78ea51ed (patch)
tree441e5bf2ea04ca9a46dfac919f7445e527bb2091
parent8ef3af646f42384cbbd0de83415b1e405ae2393a (diff)
* lib/net/http.rb (fetch): Handle properly default values; a patch by Arthur Schreiber [ruby-core:18308]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/http.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 23f22c59f8..61a9647d4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 14 05:21:12 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * lib/net/http.rb (fetch): Handle properly default values; a patch by
+ Arthur Schreiber [ruby-core:18308]
+
Mon Sep 14 04:07:09 2009 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* lib/set.rb (==): Optimization; patch by Arthur Schreiber [ruby-core:17203]
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 017a711ee6..dff0d238dd 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1297,7 +1297,7 @@ module Net #:nodoc:
# See Hash#fetch
def fetch(key, *args, &block) #:yield: +key+
a = @header.fetch(key.downcase, *args, &block)
- a.join(', ')
+ a.kind_of?(Array) ? a.join(', ') : a
end
# Iterates for each header names and values.