Skip to content

Fix bug where read/write timeout option checks were swapped #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BenjaminCubbage wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

Fix bug where read/write timeout option checks were swapped #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cdk/foundation/connection_tcpip.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ void connection_TCPIP_impl::do_connect()

// Note: Setting timeouts in microseconds. No need to convert.

if (m_opts.has_write_timeout())
connection::detail::set_timeout(m_sock, m_opts.get_read_timeout(), true);
if (m_opts.has_read_timeout())
connection::detail::set_timeout(m_sock, m_opts.get_read_timeout(), true);
if (m_opts.has_write_timeout())
connection::detail::set_timeout(m_sock, m_opts.get_write_timeout(), false);
}

Expand Down Expand Up @@ -129,9 +129,9 @@ void connection_Unix_socket_impl::do_connect()
// Note: Conversion from milliseconds to microseconds.
// TODO: Do we really need/want to set timeouts on Unix socket?

if (m_opts.has_write_timeout())
connection::detail::set_timeout(m_sock, 1000 * m_opts.get_read_timeout(), true);
if (m_opts.has_read_timeout())
connection::detail::set_timeout(m_sock, 1000 * m_opts.get_read_timeout(), true);
if (m_opts.has_write_timeout())
connection::detail::set_timeout(m_sock, 1000 * m_opts.get_write_timeout(), false);
}

Expand Down