From 924b717cfca21680bb5642b68072d8ff8a287ce2 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 19 Apr 2009 13:33:53 +0000 Subject: merges r22998 from trunk into ruby_1_9_1. -- * lib/drb/drb.rb (open_server_inaddr_any): fixed multiple network families problem. a patch from Charl Matthee at [ruby-core:21033]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/drb/drb.rb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'lib') diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index 13a89de07f..b6b7650a3b 100644 --- a/lib/drb/drb.rb +++ b/lib/drb/drb.rb @@ -842,15 +842,10 @@ module DRb Socket::SOCK_STREAM, 0, Socket::AI_PASSIVE) - family = infos.collect { |af, *_| af }.uniq - case family - when ['AF_INET'] - return TCPServer.open('0.0.0.0', port) - when ['AF_INET6'] - return TCPServer.open('::', port) - else - return TCPServer.open(port) - end + families = Hash[*infos.collect { |af, *_| af }.uniq.zip([]).flatten] + return TCPServer.open('0.0.0.0', port) if families.has_key?('AF_INET') + return TCPServer.open('::', port) if families.has_key?('AF_INET6') + return TCPServer.open(port) end # Open a server listening for connections at +uri+ using -- cgit v1.2.3