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

minor redirect fix for http_connection

This commit is contained in:
Arvid Norberg 2010-12-30 22:51:15 +00:00
parent a3e7095f84
commit 71e4172bde
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/libtorrent/http_connection.hpp
View File

@ -184,6 +184,7 @@ private:
std::string m_hostname; std::string m_hostname;
std::string m_port; std::string m_port;
std::string m_url; std::string m_url;
std::string m_user_agent;
std::list<tcp::endpoint> m_endpoints; std::list<tcp::endpoint> m_endpoints;
#ifdef TORRENT_USE_OPENSSL #ifdef TORRENT_USE_OPENSSL

22
src/http_connection.cpp
View File

@ -58,6 +58,8 @@ void http_connection::get(std::string const& url, time_duration timeout, int pri
#endif #endif
) )
{ {
m_user_agent = user_agent;
std::string protocol; std::string protocol;
std::string auth; std::string auth;
std::string hostname; std::string hostname;
@ -129,11 +131,13 @@ void http_connection::get(std::string const& url, time_duration timeout, int pri
else APPEND_FMT("\r\n"); else APPEND_FMT("\r\n");
} }
// APPEND_FMT("Accept: */*\r\n");
if (!auth.empty()) if (!auth.empty())
APPEND_FMT1("Authorization: Basic %s\r\n", base64encode(auth).c_str()); APPEND_FMT1("Authorization: Basic %s\r\n", base64encode(auth).c_str());
if (!user_agent.empty()) if (!m_user_agent.empty())
APPEND_FMT1("User-Agent: %s\r\n", user_agent.c_str()); APPEND_FMT1("User-Agent: %s\r\n", m_user_agent.c_str());
if (m_bottled) if (m_bottled)
APPEND_FMT("Accept-Encoding: gzip\r\n"); APPEND_FMT("Accept-Encoding: gzip\r\n");
@ -675,7 +679,12 @@ void http_connection::on_read(error_code const& e
= parse_url_components(location, ec); = parse_url_components(location, ec);
if (!ec) if (!ec)
{ {
get(location, m_timeout, m_priority, &m_proxy, m_redirects - 1); get(location, m_timeout, m_priority, &m_proxy, m_redirects - 1
, m_user_agent, m_bind_addr
#if TORRENT_USE_I2P
, m_i2p_conn
#endif
);
} }
else else
{ {
@ -691,7 +700,12 @@ void http_connection::on_read(error_code const& e
url += '/'; url += '/';
url += location; url += location;
get(url, m_timeout, m_priority, &m_proxy, m_redirects - 1); get(url, m_timeout, m_priority, &m_proxy, m_redirects - 1
, m_user_agent, m_bind_addr
#if TORRENT_USE_I2P
, m_i2p_conn
#endif
);
} }
return; return;
} }