From 0b400e224cb1e7b235d79623d0255b4b3641e87f Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 1 Nov 2009 15:48:31 +0000 Subject: merges r24912 from trunk into ruby_1_9_1. -- * lib/net/http.rb (fetch): Handle properly default values; a patch by Arthur Schreiber [ruby-core:18308] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25620 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/net/http.rb | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 961769560..85c20e3bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Sep 14 05:21:12 2009 Marc-Andre Lafortune + + * lib/net/http.rb (fetch): Handle properly default values; a patch by + Arthur Schreiber [ruby-core:18308] + Sun Sep 13 12:07:49 2009 Nobuyoshi Nakada * include/ruby/ruby.h (SYM2ID): needs parens. diff --git a/lib/net/http.rb b/lib/net/http.rb index 8fb08870e..efc47c000 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -1294,7 +1294,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. diff --git a/version.h b/version.h index c41301db3..11fa2dec9 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 330 +#define RUBY_PATCHLEVEL 331 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit