diff options
| author |   Peter Alfredsen <loki_val@gentoo.org> | 2008-06-04 11:52:37 +0000 |
|---|---|---|
| committer | Peter Alfredsen <loki_val@gentoo.org> | 2008-06-04 11:52:37 +0000 |
| commit | aab409209197b700a5604624158108163fb7ba61 (patch) | |
| tree | cdb544e7e23012a7f2df721ff7936f3af75c0a2b /net-libs/libtorrent/files | |
| parent | Marked ~hppa too. (diff) | |
| download | gentoo-2-aab409209197b700a5604624158108163fb7ba61.tar.gz gentoo-2-aab409209197b700a5604624158108163fb7ba61.tar.bz2 gentoo-2-aab409209197b700a5604624158108163fb7ba61.zip | |
Add fix for upstream bug 1272: rtorrent: priority_queue_insert(...) received a bad timer.
(Portage version: 2.1.5.3)
Diffstat (limited to 'net-libs/libtorrent/files')
| -rw-r--r-- | net-libs/libtorrent/files/libtorrent-0.12.2-tracker_timer_fix.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/net-libs/libtorrent/files/libtorrent-0.12.2-tracker_timer_fix.patch b/net-libs/libtorrent/files/libtorrent-0.12.2-tracker_timer_fix.patch new file mode 100644 index 000000000000..28a7c925c5b2 --- /dev/null +++ b/net-libs/libtorrent/files/libtorrent-0.12.2-tracker_timer_fix.patch @@ -0,0 +1,17 @@ +Index: libtorrent/src/tracker/tracker_manager.cc +=================================================================== +--- libtorrent/src/tracker/tracker_manager.cc (revision 1060) ++++ libtorrent/src/tracker/tracker_manager.cc (working copy) +@@ -114,8 +114,11 @@ + if (m_control->state() == DownloadInfo::STOPPED) + throw internal_error("TrackerManager::send_later() m_control->set() == DownloadInfo::STOPPED."); + ++ rak::timer t(std::max(cachedTime + rak::timer::from_seconds(2), ++ rak::timer::from_seconds(m_control->time_last_connection() + m_control->focus_min_interval()))); ++ + priority_queue_erase(&taskScheduler, &m_taskTimeout); +- priority_queue_insert(&taskScheduler, &m_taskTimeout, rak::timer::from_seconds(m_control->time_last_connection() + m_control->focus_min_interval())); ++ priority_queue_insert(&taskScheduler, &m_taskTimeout, t); + } + + // When request_{current,next} is called, m_isRequesting is set to |