diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/drb/drb.rb | 13 | ||||
| -rw-r--r-- | version.h | 8 |
3 files changed, 13 insertions, 13 deletions
@@ -1,3 +1,8 @@ +Fri Jul 3 09:05:38 2009 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> + + * lib/drb/drb.rb (open_server_inaddr_any): fixed multiple network + families problem. a patch from Charl Matthee at [ruby-core:21033]. + Wed Jul 1 15:46:30 2009 Tanaka Akira <akr@fsij.org> * lib/pathname.rb (Pathname#sub): set $~ in block.binding. diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb index 7dd0f01e76..795dc1ac4b 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 @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-07-01" +#define RUBY_RELEASE_DATE "2009-07-03" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20090701 -#define RUBY_PATCHLEVEL 176 +#define RUBY_RELEASE_CODE 20090703 +#define RUBY_PATCHLEVEL 177 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 7 -#define RUBY_RELEASE_DAY 1 +#define RUBY_RELEASE_DAY 3 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |