From: Adam Dickmeiss Date: Wed, 20 Feb 2013 10:39:26 +0000 (+0100) Subject: Avoid dead-lock between host->mutex and session lock X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=cc214ffb170de9809c3911273996eace4a9d7bfc;p=pazpar2-moved-to-github.git Avoid dead-lock between host->mutex and session lock Simply do not call non_block_events. It does nothing in the case of a timeout. --- diff --git a/src/connection.c b/src/connection.c index ce9b46d..4c165e0 100644 --- a/src/connection.c +++ b/src/connection.c @@ -319,8 +319,6 @@ static void connection_handler(IOCHAN iochan, int event) { ZOOM_connection_fire_event_timeout(co->link); - non_block_events(cl, co); - remove_connection_from_host(co); yaz_mutex_leave(host->mutex); connection_destroy(co);