diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshfs.c | 2 |
2 files changed, 7 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2011-03-25 Miklos Szeredi <miklos@szeredi.hu> + + * Fix possible deadlock on reconnection. Reported by Florian + Zumbiehl + 2011-01-25 Miklos Szeredi <miklos@szeredi.hu> * Fix cleanup when ssh connection is terminated. This prevents @@ -1319,6 +1319,8 @@ static void *process_requests(void *data_) close_conn(); g_hash_table_foreach_remove(sshfs.reqtab, (GHRFunc) clean_req, NULL); sshfs.connver ++; + sshfs.outstanding_len = 0; + pthread_cond_broadcast(&sshfs.outstanding_cond); pthread_mutex_unlock(&sshfs.lock); if (!sshfs.reconnect) { |