mirror of
https://github.com/ruby/ruby.git
synced 2025-08-23 04:55:21 +02:00
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
This commit is contained in:
parent
d393aa0893
commit
d825fc8de6
3 changed files with 9 additions and 2 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue