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 /lib | |
| 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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/resolv-replace.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |