From 879ac9dec2ccb6a006ae6aa075110f6a8946547c Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 18 Feb 2014 23:07:51 +0000 Subject: merge revision(s) 44492: [Backport #9351] * lib/rinda/ring.rb (Rinda::RingFinger#make_socket): Use ipv4_multicast_loop option for portability. Patch by Jeremy Evans. [ruby-trunk - Bug #9351] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/rinda/ring.rb | 2 +- version.h | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f83313a659..b09dc5a0ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Feb 19 07:51:02 2014 Eric Hodel + + * lib/rinda/ring.rb (Rinda::RingFinger#make_socket): Use + ipv4_multicast_loop option for portability. Patch by Jeremy Evans. + [ruby-trunk - Bug #9351] + Mon Feb 17 05:43:20 2014 Nobuyoshi Nakada * configure.in: reset LDFLAGS and DLDFLAGS for opt-dir again after diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb index 1ecc56a4f5..4e9efadc35 100644 --- a/lib/rinda/ring.rb +++ b/lib/rinda/ring.rb @@ -413,7 +413,7 @@ module Rinda soc = Socket.new(addrinfo.pfamily, addrinfo.socktype, addrinfo.protocol) if addrinfo.ipv4_multicast? then - soc.setsockopt(:IPPROTO_IP, :IP_MULTICAST_LOOP, true) + soc.setsockopt(Socket::Option.ipv4_multicast_loop(1)) soc.setsockopt(:IPPROTO_IP, :IP_MULTICAST_TTL, [@multicast_hops].pack('c')) elsif addrinfo.ipv6_multicast? then diff --git a/version.h b/version.h index 2f767ea943..faa1c6aa3e 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.1.1" -#define RUBY_RELEASE_DATE "2014-02-17" -#define RUBY_PATCHLEVEL 32 +#define RUBY_RELEASE_DATE "2014-02-19" +#define RUBY_PATCHLEVEL 33 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_DAY 19 #include "ruby/version.h" -- cgit v1.2.3