| 1 |
loki_val 08/06/04 11:52:37 |
| 2 |
|
| 3 |
Added: libtorrent-0.12.2-tracker_timer_fix.patch |
| 4 |
Log: |
| 5 |
Add fix for upstream bug 1272: rtorrent: priority_queue_insert(...) received a bad timer. |
| 6 |
(Portage version: 2.1.5.3) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-libs/libtorrent/files/libtorrent-0.12.2-tracker_timer_fix.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libtorrent/files/libtorrent-0.12.2-tracker_timer_fix.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libtorrent/files/libtorrent-0.12.2-tracker_timer_fix.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: libtorrent-0.12.2-tracker_timer_fix.patch |
| 15 |
=================================================================== |
| 16 |
Index: libtorrent/src/tracker/tracker_manager.cc |
| 17 |
=================================================================== |
| 18 |
--- libtorrent/src/tracker/tracker_manager.cc (revision 1060) |
| 19 |
+++ libtorrent/src/tracker/tracker_manager.cc (working copy) |
| 20 |
@@ -114,8 +114,11 @@ |
| 21 |
if (m_control->state() == DownloadInfo::STOPPED) |
| 22 |
throw internal_error("TrackerManager::send_later() m_control->set() == DownloadInfo::STOPPED."); |
| 23 |
|
| 24 |
+ rak::timer t(std::max(cachedTime + rak::timer::from_seconds(2), |
| 25 |
+ rak::timer::from_seconds(m_control->time_last_connection() + m_control->focus_min_interval()))); |
| 26 |
+ |
| 27 |
priority_queue_erase(&taskScheduler, &m_taskTimeout); |
| 28 |
- priority_queue_insert(&taskScheduler, &m_taskTimeout, rak::timer::from_seconds(m_control->time_last_connection() + m_control->focus_min_interval())); |
| 29 |
+ priority_queue_insert(&taskScheduler, &m_taskTimeout, t); |
| 30 |
} |
| 31 |
|
| 32 |
// When request_{current,next} is called, m_isRequesting is set to |
| 33 |
|
| 34 |
|
| 35 |
|
| 36 |
-- |
| 37 |
gentoo-commits@l.g.o mailing list |
Archives