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

merged changes from RC_1_0

This commit is contained in:
Arvid Norberg 2014-12-30 09:02:20 +00:00
parent 1a45d2ebd3
commit fcf6beace5
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -42,6 +42,8 @@
* almost completely changed the storage interface (for custom storage) * almost completely changed the storage interface (for custom storage)
* added support for hashing pieces in multiple threads * added support for hashing pieces in multiple threads
* fix bug in tracker timeout logic
* switch UPnP post back to HTTP 1.1
* support conditional DHT get * support conditional DHT get
* OpenSSL build fixes * OpenSSL build fixes
* fix DHT scrape bug * fix DHT scrape bug

4
src/settings_pack.cpp
View File

@ -205,8 +205,8 @@ namespace libtorrent
int_setting_entry_t int_settings[settings_pack::num_int_settings] = int_setting_entry_t int_settings[settings_pack::num_int_settings] =
{ {
SET(tracker_completion_timeout, 60, 0), SET(tracker_completion_timeout, 30, 0),
SET(tracker_receive_timeout, 40, 0), SET(tracker_receive_timeout, 10, 0),
SET(stop_tracker_timeout, 5, 0), SET(stop_tracker_timeout, 5, 0),
SET(tracker_maximum_response_length, 1024*1024, 0), SET(tracker_maximum_response_length, 1024*1024, 0),
SET(piece_timeout, 20, 0), SET(piece_timeout, 20, 0),

6
src/udp_tracker_connection.cpp
View File

@ -168,6 +168,12 @@ namespace libtorrent
#endif #endif
get_io_service().post(boost::bind( get_io_service().post(boost::bind(
&udp_tracker_connection::start_announce, shared_from_this())); &udp_tracker_connection::start_announce, shared_from_this()));
session_settings const& settings = m_ses.settings();
set_timeout(tracker_req().event == tracker_request::stopped
? settings.stop_tracker_timeout
: settings.tracker_completion_timeout
, settings.tracker_receive_timeout);
} }
void udp_tracker_connection::name_lookup(error_code const& error void udp_tracker_connection::name_lookup(error_code const& error

2
src/upnp.cpp
View File

@ -656,7 +656,7 @@ void upnp::post(upnp::rootdevice const& d, char const* soap
TORRENT_ASSERT(d.upnp_connection); TORRENT_ASSERT(d.upnp_connection);
char header[2048]; char header[2048];
snprintf(header, sizeof(header), "POST %s HTTP/1.0\r\n" snprintf(header, sizeof(header), "POST %s HTTP/1.1\r\n"
"Host: %s:%u\r\n" "Host: %s:%u\r\n"
"Content-Type: text/xml; charset=\"utf-8\"\r\n" "Content-Type: text/xml; charset=\"utf-8\"\r\n"
"Content-Length: %d\r\n" "Content-Length: %d\r\n"