archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 44492: [Backport #9351]

Browse source 
* 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
This commit is contained in:
naruse 2014-02-18 23:07:51 +00:00
parent 4ee9d27f3a
commit 879ac9dec2
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Feb 19 07:51:02 2014 Eric Hodel <drbrain@segment7.net>
* 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 <nobu@ruby-lang.org>
* configure.in: reset LDFLAGS and DLDFLAGS for opt-dir again after

2
lib/rinda/ring.rb
View file

@ -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

6
version.h
View file

@ -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"