From f1620182c060dd5bc97c1b30c484a13a04c50f05 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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/drb/drb.rb | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93670714a..874450571 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 18 02:41:33 2009 Masatoshi SEKI + + * lib/drb/drb.rb (open_server_inaddr_any): fixed multiple network + families problem. a patch from Charl Matthee at [ruby-core:21033]. + Tue Mar 17 21:42:54 2009 Nobuyoshi Nakada * tool/make-snapshot (package): creates .revision.time and passes diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index 13a89de07..b6b7650a3 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