From e99b32a176cbbc2201f02fdcc12bad07efa117ef Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Tue, 23 Jan 2018 16:22:25 -0800 Subject: [PATCH] ircd::net: Hit cancel() before any of the disconnect sequences. --- ircd/net.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ircd/net.cc b/ircd/net.cc index dff9a5928..3c31e0408 100644 --- a/ircd/net.cc +++ b/ircd/net.cc @@ -1311,6 +1311,7 @@ try in.bytes, out.bytes); + cancel(); if(opts.sopts) set(*this, *opts.sopts); @@ -1339,7 +1340,6 @@ try std::bind(&socket::handle_disconnect, this, shared_from(*this), std::move(callback), ph::_1) }; - cancel(); set_timeout(opts.timeout); ssl.async_shutdown(std::move(disconnect_handler)); return;