naruse	2014-02-20 12:25:08 +0900 (Thu, 20 Feb 2014)

  New Revision: 45060

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

  Log:
    merge revision(s) 44494:
    
    * lib/rinda/ring.rb (Rinda::RingFinger#make_socket):  Use
      ipv4_multicast_ttl option for portability.

  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 45059)
+++ ruby_2_1/ChangeLog	(revision 45060)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu Feb 20 12:24:59 2014  Eric Hodel  <drbrain@s...>
+
+	* lib/rinda/ring.rb (Rinda::RingFinger#make_socket):  Use
+	  ipv4_multicast_ttl option for portability.
+
 Thu Feb 20 10:19:40 2014  Tanaka Akira  <akr@f...>
 
 	* ext/socket/option.c: IP_MULTICAST_LOOP and IP_MULTICAST_TTL socket
Index: ruby_2_1/lib/rinda/ring.rb
===================================================================
--- ruby_2_1/lib/rinda/ring.rb	(revision 45059)
+++ ruby_2_1/lib/rinda/ring.rb	(revision 45060)
@@ -414,8 +414,7 @@ module Rinda https://github.com/ruby/ruby/blob/trunk/ruby_2_1/lib/rinda/ring.rb#L414
 
       if addrinfo.ipv4_multicast? then
         soc.setsockopt(Socket::Option.ipv4_multicast_loop(1))
-        soc.setsockopt(:IPPROTO_IP, :IP_MULTICAST_TTL,
-                       [@multicast_hops].pack('c'))
+        soc.setsockopt(Socket::Option.ipv4_multicast_ttl(@multicast_hops))
       elsif addrinfo.ipv6_multicast? then
         soc.setsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_LOOP, true)
         soc.setsockopt(:IPPROTO_IPV6, :IPV6_MULTICAST_HOPS,
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 45059)
+++ ruby_2_1/version.h	(revision 45060)
@@ -1,6 +1,6 @@ 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-20"
-#define RUBY_PATCHLEVEL 36
+#define RUBY_PATCHLEVEL 37
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2

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


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