1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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/trunk@39725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2013-03-11 13:47:04 +00:00
parent 79ea4d627f
commit b1f2effda8
2 changed files with 8 additions and 1 deletions

View file

@ -1,3 +1,10 @@
Mon Mar 11 22:44:57 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.
Mon Mar 11 19:22:54 2013 NAKAMURA Usaku <usa@ruby-lang.org>
* test/mkmf/base.rb: class name conflict.

View file

@ -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