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

* ext/socket/lib/socket.rb: fix argument check in the previous commit.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32908 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2011-08-10 14:04:23 +00:00
parent e7320dbe32
commit 6c0e64dee5
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Wed Aug 10 23:03:55 2011 Tanaka Akira <akr@fsij.org>
* ext/socket/lib/socket.rb: fix argument check in the previous commit.
Wed Aug 10 22:12:28 2011 Tanaka Akira <akr@fsij.org> Wed Aug 10 22:12:28 2011 Tanaka Akira <akr@fsij.org>
* ext/socket/lib/socket.rb (Socket.tcp): add :connect_timeout option. * ext/socket/lib/socket.rb (Socket.tcp): add :connect_timeout option.

4
ext/socket/lib/socket.rb
View file

@ -102,7 +102,6 @@ class Addrinfo
# #
def connect_from(*args, &block) def connect_from(*args, &block)
opts = Hash === args.last ? args.pop : {} opts = Hash === args.last ? args.pop : {}
raise ArgumentError, "wrong number of arguments (#{args.length} for 1)" if 1 < args.length
local_addr_args = args local_addr_args = args
connect_internal(family_addrinfo(*local_addr_args), opts[:timeout], &block) connect_internal(family_addrinfo(*local_addr_args), opts[:timeout], &block)
end end
@ -151,7 +150,6 @@ class Addrinfo
# #
def connect_to(*args, &block) def connect_to(*args, &block)
opts = Hash === args.last ? args.pop : {} opts = Hash === args.last ? args.pop : {}
raise ArgumentError, "wrong number of arguments (#{args.length} for 1)" if 1 < args.length
remote_addr_args = args remote_addr_args = args
remote_addrinfo = family_addrinfo(*remote_addr_args) remote_addrinfo = family_addrinfo(*remote_addr_args)
remote_addrinfo.send(:connect_internal, self, opts[:timeout], &block) remote_addrinfo.send(:connect_internal, self, opts[:timeout], &block)
@ -299,7 +297,7 @@ class Socket < BasicSocket
# #
def self.tcp(host, port, *rest) # :yield: socket def self.tcp(host, port, *rest) # :yield: socket
opts = Hash === rest.last ? rest.pop : {} opts = Hash === rest.last ? rest.pop : {}
raise ArgumentError, "wrong number of arguments (#{args.length} for 2)" if 2 < args.length raise ArgumentError, "wrong number of arguments (#{rest.length} for 2)" if 2 < rest.length
local_host, local_port = rest local_host, local_port = rest
last_error = nil last_error = nil
ret = nil ret = nil