From f72f77aeb20e7dd27135c679d9aeae0edb507902 Mon Sep 17 00:00:00 2001 From: Arvid Norberg Date: Thu, 22 Aug 2013 02:55:19 +0000 Subject: [PATCH] a few minor fixes --- src/connection_queue.cpp | 1 - src/socks5_stream.cpp | 9 +++++++++ src/web_peer_connection.cpp | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/connection_queue.cpp b/src/connection_queue.cpp index 18fe9cd6d..c71535b92 100644 --- a/src/connection_queue.cpp +++ b/src/connection_queue.cpp @@ -115,7 +115,6 @@ namespace libtorrent if (i == m_queue.end()) { // this might not be here in case on_timeout calls remove - TORRENT_ASSERT(false); return false; } if (i->connecting) --m_num_connecting; diff --git a/src/socks5_stream.cpp b/src/socks5_stream.cpp index a4bbcdc9d..d49bff876 100644 --- a/src/socks5_stream.cpp +++ b/src/socks5_stream.cpp @@ -436,6 +436,9 @@ namespace libtorrent { if (m_listen == 0) { +#if defined TORRENT_ASIO_DEBUGGING + add_outstanding_async("socks5_stream::connect1"); +#endif m_listen = 1; connect1(e, h); return; @@ -494,6 +497,9 @@ namespace libtorrent { if (m_listen == 0) { +#if defined TORRENT_ASIO_DEBUGGING + add_outstanding_async("socks5_stream::connect1"); +#endif m_listen = 1; connect1(e, h); return; @@ -543,6 +549,9 @@ namespace libtorrent { if (m_listen == 0) { +#if defined TORRENT_ASIO_DEBUGGING + add_outstanding_async("socks5_stream::connect1"); +#endif m_listen = 1; connect1(e, h); return; diff --git a/src/web_peer_connection.cpp b/src/web_peer_connection.cpp index 8a1c9add0..78476bb7a 100644 --- a/src/web_peer_connection.cpp +++ b/src/web_peer_connection.cpp @@ -477,7 +477,7 @@ namespace libtorrent if (!is_ok_status(m_parser.status_code())) { 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 t->retry_web_seed(this, retry_time); std::string error_msg = to_string(m_parser.status_code()).elems