premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

merged proxy fix for adding .torrent file by URL from RC_0_16

This commit is contained in:
Arvid Norberg 2014-04-06 05:07:10 +00:00
parent a15388df5f
commit 1afa9db689
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -45,6 +45,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
* fix to use proxy settings when adding .torrent file from URL
* fix resume file issue related to daylight savings time on windows * fix resume file issue related to daylight savings time on windows
* improve error checking in lazy_bdecode * improve error checking in lazy_bdecode

13
src/torrent.cpp
View File

@ -829,10 +829,17 @@ namespace libtorrent
new http_connection(m_ses.m_io_service, m_ses.m_half_open new http_connection(m_ses.m_io_service, m_ses.m_half_open
, boost::bind(&torrent::on_torrent_download, shared_from_this() , boost::bind(&torrent::on_torrent_download, shared_from_this()
, _1, _2, _3, _4) , _1, _2, _3, _4)
, true //bottled , true // bottled
, m_ses.settings().max_http_recv_buffer_size //bottled buffer size , m_ses.settings().max_http_recv_buffer_size // bottled buffer size
, http_connect_handler()
, http_filter_handler()
#ifdef TORRENT_USE_OPENSSL
, m_ssl_ctx.get()
#endif
)); ));
conn->get(m_url, seconds(30), 0, 0, 5, m_ses.m_settings.user_agent);
conn->get(m_url, seconds(30), 0, &m_ses.proxy()
, 5, m_ses.m_settings.user_agent);
set_state(torrent_status::downloading_metadata); set_state(torrent_status::downloading_metadata);
} }