Commit 44c8202b authored by Evan Hunt's avatar Evan Hunt

Merge branch '834-fix-race-in-fctx-cancel' into 'master'

fix race in socket code

Closes #834

See merge request !1671
parents 3365064f 50f60542
Pipeline #11796 passed with stages
in 1 minute and 5 seconds
5182. [bug] Fix a high-load race/crash in handling of
isc_socket_close() in resolver. [GL #834]
5181. [func] Add a mechanism for a DLZ module to signal that
the view's allow-transfer ACL should be used to
determine whether transfers are allowed. [GL #803]
......
......@@ -1321,7 +1321,8 @@ fctx_cancelquery(resquery_t **queryp, dns_dispatchevent_t **deventp,
isc_socket_cancel(sock, NULL,
ISC_SOCKCANCEL_CONNECT);
}
} else if (RESQUERY_SENDING(query)) {
}
if (RESQUERY_SENDING(query)) {
/*
* Cancel the pending send.
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment