From 0a6c1e05c2ab6ab49772c529aa800fd47152e963 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Sun, 7 Oct 2012 02:30:10 +0000 Subject: [PATCH] merged web seed fix from RC_0_16 --- ChangeLog | 1 + src/web_peer_connection.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a75a819bb..4556c2e17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ * fix uTP edge case where udp socket buffer fills up * fix nagle implementation in uTP + * fix performance issue in web seed downloader (coalescing of blocks sometimes wouldn't work) * web seed fixes (better support for torrents without trailing / in web seeds) * fix some issues with SSL over uTP connections * fix UDP trackers trying all endpoints behind the hostname diff --git a/src/web_peer_connection.cpp b/src/web_peer_connection.cpp index 481475af7..5a81b62bf 100644 --- a/src/web_peer_connection.cpp +++ b/src/web_peer_connection.cpp @@ -88,7 +88,7 @@ namespace libtorrent // we always prefer downloading 1 MiB chunks // from web seeds, or whole pieces if pieces // are larger than a MiB - prefer_whole_pieces((std::min)((1024 * 1024) / tor->torrent_file().piece_length(), 1)); + prefer_whole_pieces((std::max)((1024 * 1024) / tor->torrent_file().piece_length(), 1)); // we want large blocks as well, so // we can request more bytes at once