diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-03 17:27:19 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-03 17:27:19 +0000 |
commit | d825fc8de6e94abb5e918d3c6e5b4d56f572975c (patch) | |
tree | bfc3b2ab030780765514cad72b2f5dc8d1e93ca7 | |
parent | d393aa089353066c2ab036a0cbe2fff6563ed4f4 (diff) |
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
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | lib/resolv-replace.rb | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Thu Apr 4 02:27:12 2013 Tanaka Akira <akr@fsij.org> + + * 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 <naruse@ruby-lang.org> * 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 @@ -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 |