fix test_transfer to set mixed mode to 'prefer_tcp' to avoid having it interfere with the send rate. optimize the test to run a lot faster. fix proxy to allow any protocol (fixes issue where test failed with http and https proxy). Bump the minimum rate limit to 20kB/s (from 5kB/s) in proportional mixed mode algorithm

This commit is contained in:
Arvid Norberg
2010-12-27 22:54:14 +00:00
parent 40e1bea451
commit d1124574ef
3 changed files with 171 additions and 157 deletions

View File

@@ -2335,8 +2335,8 @@ namespace aux {
else
{
if (num_tcp_peers == 0) num_tcp_peers = 1;
int upload_rate = (std::max)(m_stat.upload_rate(), 5000);
int download_rate = (std::max)(m_stat.download_rate(), 5000);
int upload_rate = (std::max)(m_stat.upload_rate(), 20000);
int download_rate = (std::max)(m_stat.download_rate(), 20000);
if (m_upload_channel.throttle()) upload_rate = m_upload_channel.throttle();
if (m_download_channel.throttle()) download_rate = m_download_channel.throttle();