Merge tag v13.2.1 into v14.0.x

sociomantic-tsunami · Feb 16, 2018 · 1121d51 · 1121d51
2 parents e85e9da + c646488
commit 1121d51
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/dhtproto/node/request/Listen.d b/src/dhtproto/node/request/Listen.d
@@ -19,6 +19,8 @@ module dhtproto.node.request.Listen;
 *******************************************************************************/
 
 import ocean.transition;
+import ocean.core.Traits;
+import ocean.io.select.client.model.ISelectClient;
 
 import dhtproto.node.request.model.SingleChannel;
 
@@ -91,7 +93,17 @@ public abstract scope class Listen : SingleChannel
             }
             finally
             {
-                this.reader.fiber.epoll.unregister(disconnect_detector);
+                // deprecated: in next major, only the else branch should be
+                // left (starting from major that supports at least ocean v4.1.0).
+                static if (hasMethod!(typeof(this.reader.fiber.epoll),
+                                  "unregister", int delegate(ISelectClient, bool)))
+                {
+                    this.reader.fiber.epoll.unregister(disconnect_detector, true);
+                }
+                else
+                {
+                    this.reader.fiber.epoll.unregister(disconnect_detector);
+                }
             }
 
             if (disconnect_detector.disconnected)