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

merged fixes from RC_0_16

This commit is contained in:
Arvid Norberg 2013-11-08 07:23:36 +00:00
parent a00f396224
commit dafa812109
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libtorrent/bt_peer_connection.hpp
View File

@ -295,7 +295,7 @@ public:
virtual void send_buffer(char const* begin, int size, int flags = 0
, void (*fun)(char*, int, void*) = 0, void* userdata = 0);
template <class Destructor>
void append_send_buffer(char* buffer, int size, Destructor const& destructor)
void bt_append_send_buffer(char* buffer, int size, Destructor const& destructor)
{
#ifndef TORRENT_DISABLE_ENCRYPTION
if (m_rc4_encrypted)

2
include/libtorrent/peer_connection.hpp
View File

@ -573,7 +573,7 @@ namespace libtorrent
template <class Destructor>
void append_send_buffer(char* buffer, int size, Destructor const& destructor
, bool encrypted = false)
, bool encrypted)
{
#if defined TORRENT_DISK_STATS
log_buffer_usage(buffer, size, "queued send buffer");

4
src/bt_peer_connection.cpp
View File

@ -613,7 +613,7 @@ namespace libtorrent
// since we'll mutate it
char* buf = (char*)malloc(size);
memcpy(buf, buffer, size);
bt_peer_connection::append_send_buffer(buf, size, boost::bind(&::free, _1));
bt_append_send_buffer(buf, size, boost::bind(&::free, _1));
}
else
#endif
@ -2314,7 +2314,7 @@ namespace libtorrent
send_buffer(msg, 13);
}
append_send_buffer(buffer.get(), r.length
bt_append_send_buffer(buffer.get(), r.length
, boost::bind(&session_impl::free_disk_buffer
, boost::ref(m_ses), _1));
buffer.release();

16
src/upnp.cpp
View File

@ -1263,6 +1263,22 @@ void upnp::on_upnp_map_response(error_code const& e
return;
}
std::string ct = p.header("content-type");
if (!ct.empty()
&& ct.find_first_of("text/xml") == std::string::npos
&& ct.find_first_of("text/soap+xml") == std::string::npos
&& ct.find_first_of("application/xml") == std::string::npos
&& ct.find_first_of("application/soap+xml") == std::string::npos
)
{
char msg[300];
snprintf(msg, sizeof(msg), "error while adding port map: invalid content-type, \"%s\". Expected text/xml or application/soap+xml"
, ct.c_str());
log(msg, l);
next(d, mapping, l);
return;
}
// We don't want to ignore responses with return codes other than 200
// since those might contain valid UPnP error codes