wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

fix shutdown hang issue in connection queue

This commit is contained in:
Arvid Norberg 2012-07-14 20:37:31 +00:00
parent 450a9f69ef
commit 2a08bb5feb
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,6 +1,8 @@
* fix uTP edge case where udp socket buffer fills up * fix uTP edge case where udp socket buffer fills up
* fix nagle implementation in uTP * fix nagle implementation in uTP
* fix race condition causing shutdown hang
0.16.2 release 0.16.2 release
* fix permissions issue on linux whith noatime enabled for non-owned files * fix permissions issue on linux whith noatime enabled for non-owned files

3
src/connection_queue.cpp
View File

@ -277,7 +277,8 @@ namespace libtorrent
#endif #endif
TORRENT_ASSERT(!e || e == error::operation_aborted); TORRENT_ASSERT(!e || e == error::operation_aborted);
if (e) return; if (e && m_num_connecting == 0)
return;
ptime next_expire = max_time(); ptime next_expire = max_time();
ptime now = time_now_hires() + milliseconds(100); ptime now = time_now_hires() + milliseconds(100);