From d825fc8de6e94abb5e918d3c6e5b4d56f572975c Mon Sep 17 00:00:00 2001 From: nagachika Date: Wed, 3 Apr 2013 17:27:19 +0000 Subject: [PATCH] merge revision(s) 39725: [Backport #8054] * lib/resolv-replace.rb (TCPSocket#initialize): resolve the 3rd argument only if non-nil value is given. [ruby-dev:47150] [ruby-trunk - Bug #8054] reported and analyzed by mrkn. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@40089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ lib/resolv-replace.rb | 2 +- version.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2a6d2f541..d24adc3290 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Thu Apr 4 02:27:12 2013 Tanaka Akira + + * lib/resolv-replace.rb (TCPSocket#initialize): resolve the 3rd + argument only if non-nil value is given. + [ruby-dev:47150] [ruby-trunk - Bug #8054] reported and analyzed by + mrkn. + Thu Apr 4 02:24:59 2013 NARUSE, Yui * Merge Onigmo d4bad41e16e3eccd97ccce6f1f96712e557c4518. diff --git a/lib/resolv-replace.rb b/lib/resolv-replace.rb index ff34f90db4..3e28a843fd 100644 --- a/lib/resolv-replace.rb +++ b/lib/resolv-replace.rb @@ -19,7 +19,7 @@ class TCPSocket < IPSocket alias original_resolv_initialize initialize # :startdoc: def initialize(host, serv, *rest) - rest[0] = IPSocket.getaddress(rest[0]) unless rest.empty? + rest[0] = IPSocket.getaddress(rest[0]) if rest[0] original_resolv_initialize(IPSocket.getaddress(host), serv, *rest) end end diff --git a/version.h b/version.h index 825c9153e6..880e8adbdc 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-04-04" -#define RUBY_PATCHLEVEL 104 +#define RUBY_PATCHLEVEL 105 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 4