diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-10-08 14:28:50 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-10-08 14:28:50 -0500 |
| commit | ca975bcb79f03bc82640eac5df60c5674c4ecdf4 (patch) | |
| tree | 076bf47078d81a2e2879ff84e1263863cfa79a48 /contrib | |
| parent | Merge pull request #5939 (diff) | |
| parent | epee: fix network timeouts in blocked_mode_client (diff) | |
| download | monero-ca975bcb79f03bc82640eac5df60c5674c4ecdf4.tar.xz | |
Merge pull request #5917
7d81850 epee: fix network timeouts in blocked_mode_client (xiphon)
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/epee/include/net/net_helper.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/epee/include/net/net_helper.h b/contrib/epee/include/net/net_helper.h index 2b02eafa4..e2dedfdd0 100644 --- a/contrib/epee/include/net/net_helper.h +++ b/contrib/epee/include/net/net_helper.h @@ -108,11 +108,12 @@ namespace net_utils m_ssl_options(epee::net_utils::ssl_support_t::e_ssl_support_autodetect), m_initialized(true), m_connected(false), - m_deadline(m_io_service), + m_deadline(m_io_service, std::chrono::steady_clock::time_point::max()), m_shutdowned(0), m_bytes_sent(0), m_bytes_received(0) { + check_deadline(); } /*! The first/second parameters are host/port respectively. The third |