merged fix from RC_0_16

This commit is contained in:
Arvid Norberg 2012-12-31 03:12:11 +00:00
parent e2d14078ec
commit d7bef3dbf9
2 changed files with 8 additions and 0 deletions

View File

@ -7,6 +7,8 @@
* fix uTP edge case where udp socket buffer fills up
* fix nagle implementation in uTP
* active_dht_limit, active_tracker_limit and active_lsd_limit now interpret -1 as infinite
0.16.6 release
* fixed verbose log error for NAT holepunching

View File

@ -4205,6 +4205,12 @@ retry:
num_seeds = (std::numeric_limits<int>::max)();
if (hard_limit == -1)
hard_limit = (std::numeric_limits<int>::max)();
if (dht_limit == -1)
dht_limit = (std::numeric_limits<int>::max)();
if (lsd_limit == -1)
lsd_limit = (std::numeric_limits<int>::max)();
if (tracker_limit == -1)
tracker_limit = (std::numeric_limits<int>::max)();
for (torrent_map::iterator i = m_torrents.begin()
, end(m_torrents.end()); i != end; ++i)