From bb1115a2d6b1ab37a1ae725bc26a965884f44029 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 9 Jan 2012 11:18:00 +0000 Subject: * ext/socket/lib/socket.rb (family_addrinfo): don't require protocol equality. For example, protocol 0 and IPPROTO_TCP is not problem for TCP. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34245 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/lib/socket.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ext/socket/lib/socket.rb') diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb index 3abbee8317..10ab13b953 100644 --- a/ext/socket/lib/socket.rb +++ b/ext/socket/lib/socket.rb @@ -17,7 +17,10 @@ class Addrinfo elsif Addrinfo === args.first raise ArgumentError, "too many arguments" if args.length != 1 addrinfo = args.first - raise ArgumentError, "Addrinfo type mismatch" if (self.pfamily != addrinfo.pfamily) || (self.socktype != addrinfo.socktype) || (self.protocol != addrinfo.protocol) + if (self.pfamily != addrinfo.pfamily) || + (self.socktype != addrinfo.socktype) + raise ArgumentError, "Addrinfo type mismatch" + end addrinfo elsif self.ip? raise ArgumentError, "IP address needs host and port but #{args.length} arguments given" if args.length != 2 -- cgit v1.2.3