ruby-changes:11378
From: seki <ko1@a...>
Date: Wed, 18 Mar 2009 02:44:50 +0900 (JST)
Subject: [ruby-changes:11378] Ruby:r22998 (trunk): * lib/drb/drb.rb (open_server_inaddr_any): fixed multiple network
seki 2009-03-18 02:43:48 +0900 (Wed, 18 Mar 2009) New Revision: 22998 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=22998 Log: * lib/drb/drb.rb (open_server_inaddr_any): fixed multiple network families problem. a patch from Charl Matthee at [ruby-core:21033]. Modified files: trunk/ChangeLog trunk/lib/drb/drb.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 22997) +++ ChangeLog (revision 22998) @@ -1,3 +1,8 @@ +Wed Mar 18 02:41:33 2009 Masatoshi SEKI <m_seki@m...> + + * 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 <nobu@r...> * tool/make-snapshot (package): creates .revision.time and passes Index: lib/drb/drb.rb =================================================================== --- lib/drb/drb.rb (revision 22997) +++ lib/drb/drb.rb (revision 22998) @@ -842,15 +842,10 @@ 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/