naruse	2014-02-19 08:07:51 +0900 (Wed, 19 Feb 2014)

  New Revision: 45041

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45041

  Log:
    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]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/lib/rinda/ring.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 45040)
+++ ruby_2_1/ChangeLog	(revision 45041)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Wed Feb 19 07:51:02 2014  Eric Hodel  <drbrain@s...>
+
+	* 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@r...>
 
 	* configure.in: reset LDFLAGS and DLDFLAGS for opt-dir again after
Index: ruby_2_1/lib/rinda/ring.rb
===================================================================
--- ruby_2_1/lib/rinda/ring.rb	(revision 45040)
+++ ruby_2_1/lib/rinda/ring.rb	(revision 45041)
@@ -413,7 +413,7 @@ module Rinda https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/rinda/ring.rb#L413
       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
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45040)
+++ ruby_2_1/version.h	(revision 45041)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #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"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44492


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/