wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

i2p fix (broke with updated ssl code)

This commit is contained in:
Arvid Norberg 2010-10-22 05:02:42 +00:00
parent cadd4f1b8d
commit 5efd0a9c20
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/http_connection.cpp
View File

@ -218,28 +218,28 @@ void http_connection::start(std::string const& hostname, std::string const& port
} }
#endif #endif
// in this case, the upper layer is assumed to have taken
// care of the proxying already. Don't instantiate the socket
// with this proxy
if (ps && (ps->type == proxy_settings::http
|| ps->type == proxy_settings::http_pw)
&& !ssl)
{
ps = 0;
}
proxy_settings null_proxy;
proxy_settings const* proxy = ps; proxy_settings const* proxy = ps;
#if TORRENT_USE_I2P #if TORRENT_USE_I2P
if (is_i2p) proxy = &i2p_conn->proxy(); if (is_i2p) proxy = &i2p_conn->proxy();
#endif #endif
// in this case, the upper layer is assumed to have taken
// care of the proxying already. Don't instantiate the socket
// with this proxy
if (proxy && (proxy->type == proxy_settings::http
|| proxy->type == proxy_settings::http_pw)
&& !ssl)
{
proxy = 0;
}
proxy_settings null_proxy;
void* userdata = 0; void* userdata = 0;
#ifdef TORRENT_USE_OPENSSL #ifdef TORRENT_USE_OPENSSL
if (m_ssl) userdata = &m_ssl_ctx; if (m_ssl) userdata = &m_ssl_ctx;
#endif #endif
bool ret = instantiate_connection(m_resolver.get_io_service() bool ret = instantiate_connection(m_resolver.get_io_service()
, ps ? *ps : null_proxy, m_sock, userdata); , proxy ? *proxy : null_proxy, m_sock, userdata);
if (m_bind_addr != address_v4::any()) if (m_bind_addr != address_v4::any())
{ {