aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-28 02:52:31 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-10-28 02:52:31 +0000
commit00ce700c933a0625d97ba5417909cd95c90f4eab (patch)
treeb81187051730ccb96235014943380124cc8094ae
parenta8919bc0a650463ed98a3e2f24fb94236e35effc (diff)
downloadruby-00ce700c933a0625d97ba5417909cd95c90f4eab.tar.gz
Revert "* lib/rinda/ring.rb: Linux's SO_REUSEPORT is not for multicast."
This reverts commit r52314. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52316 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/rinda/ring.rb2
2 files changed, 1 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 35148560df..a4e7d74659 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Wed Oct 28 05:59:19 2015 NARUSE, Yui <naruse@ruby-lang.org>
-
- * lib/rinda/ring.rb: Linux's SO_REUSEPORT is not for multicast.
-
Tue Oct 27 23:14:14 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* defs/id.def: enable anonymous IDs not to expose internal IDs for
diff --git a/lib/rinda/ring.rb b/lib/rinda/ring.rb
index 784d0d503d..fe33420494 100644
--- a/lib/rinda/ring.rb
+++ b/lib/rinda/ring.rb
@@ -137,7 +137,7 @@ module Rinda
@sockets << socket
if addrinfo.ipv4_multicast? or addrinfo.ipv6_multicast? then
- if Socket.const_defined?(:SO_REUSEPORT) && /linux/ !~ RUBY_PLATFORM then
+ if Socket.const_defined?(:SO_REUSEPORT) then
socket.setsockopt(:SOCKET, :SO_REUSEPORT, true)
else
socket.setsockopt(:SOCKET, :SO_REUSEADDR, true)