merged change from RC_0_16
This commit is contained in:
parent
9ac63f9aba
commit
a35c32bc51
|
@ -10,6 +10,7 @@
|
||||||
* 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
|
||||||
|
|
||||||
|
* set_piece_deadline() also unfilters the piece (if its priority is 0)
|
||||||
* add work-around for bug in windows vista and earlier in GetOverlappedResult
|
* add work-around for bug in windows vista and earlier in GetOverlappedResult
|
||||||
* fix traversal algorithm leak in DHT
|
* fix traversal algorithm leak in DHT
|
||||||
* fix string encoding conversions on windows
|
* fix string encoding conversions on windows
|
||||||
|
|
|
@ -3721,6 +3721,9 @@ namespace libtorrent
|
||||||
std::iter_swap(i, boost::prior(i));
|
std::iter_swap(i, boost::prior(i));
|
||||||
--i;
|
--i;
|
||||||
}
|
}
|
||||||
|
// just in case this piece had priority 0
|
||||||
|
if (m_picker->piece_priority(piece) == 0)
|
||||||
|
m_picker->set_piece_priority(piece, 1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3735,6 +3738,10 @@ namespace libtorrent
|
||||||
, m_time_critical_pieces.end(), p);
|
, m_time_critical_pieces.end(), p);
|
||||||
m_time_critical_pieces.insert(i, p);
|
m_time_critical_pieces.insert(i, p);
|
||||||
|
|
||||||
|
// just in case this piece had priority 0
|
||||||
|
if (m_picker->piece_priority(piece) == 0)
|
||||||
|
m_picker->set_piece_priority(piece, 1);
|
||||||
|
|
||||||
piece_picker::downloading_piece pi;
|
piece_picker::downloading_piece pi;
|
||||||
m_picker->piece_info(piece, pi);
|
m_picker->piece_info(piece, pi);
|
||||||
if (pi.requested == 0) return;
|
if (pi.requested == 0) return;
|
||||||
|
|
Loading…
Reference in New Issue