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

a few minor fixes

This commit is contained in:
Arvid Norberg 2013-08-22 02:55:19 +00:00
parent 0f57615ea3
commit f72f77aeb2
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/connection_queue.cpp
View File

@ -115,7 +115,6 @@ namespace libtorrent
if (i == m_queue.end()) if (i == m_queue.end())
{ {
// this might not be here in case on_timeout calls remove // this might not be here in case on_timeout calls remove
TORRENT_ASSERT(false);
return false; return false;
} }
if (i->connecting) --m_num_connecting; if (i->connecting) --m_num_connecting;

9
src/socks5_stream.cpp
View File

@ -436,6 +436,9 @@ namespace libtorrent
{ {
if (m_listen == 0) if (m_listen == 0)
{ {
#if defined TORRENT_ASIO_DEBUGGING
add_outstanding_async("socks5_stream::connect1");
#endif
m_listen = 1; m_listen = 1;
connect1(e, h); connect1(e, h);
return; return;
@ -494,6 +497,9 @@ namespace libtorrent
{ {
if (m_listen == 0) if (m_listen == 0)
{ {
#if defined TORRENT_ASIO_DEBUGGING
add_outstanding_async("socks5_stream::connect1");
#endif
m_listen = 1; m_listen = 1;
connect1(e, h); connect1(e, h);
return; return;
@ -543,6 +549,9 @@ namespace libtorrent
{ {
if (m_listen == 0) if (m_listen == 0)
{ {
#if defined TORRENT_ASIO_DEBUGGING
add_outstanding_async("socks5_stream::connect1");
#endif
m_listen = 1; m_listen = 1;
connect1(e, h); connect1(e, h);
return; return;

2
src/web_peer_connection.cpp
View File

@ -477,7 +477,7 @@ namespace libtorrent
if (!is_ok_status(m_parser.status_code())) if (!is_ok_status(m_parser.status_code()))
{ {
int retry_time = atoi(m_parser.header("retry-after").c_str()); int retry_time = atoi(m_parser.header("retry-after").c_str());
if (retry_time <= 0) retry_time = 5 * 60; if (retry_time <= 0) retry_time = m_ses.settings().urlseed_wait_retry;
// temporarily unavailable, retry later // temporarily unavailable, retry later
t->retry_web_seed(this, retry_time); t->retry_web_seed(this, retry_time);
std::string error_msg = to_string(m_parser.status_code()).elems std::string error_msg = to_string(m_parser.status_code()).elems