Skip to content

Improvements of async connection timeout #417

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

Merged
merged 1 commit into from
Jul 28, 2014
Merged

Improvements of async connection timeout #417

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
16 changes: 11 additions & 5 deletions boost/network/protocol/http/client/connection/async_normal.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ struct http_async_connection
connection_delegate_ptr delegate)
: timeout_(timeout),
timer_(resolver.get_io_service()),
is_timedout_(false),
follow_redirect_(follow_redirect),
resolver_(resolver),
resolve_(resolve),
Expand Down Expand Up @@ -122,6 +123,7 @@ struct http_async_connection

void handle_timeout(boost::system::error_code const &ec) {
if (!ec) delegate_->disconnect();
is_timedout_ = true;
}

void handle_resolved(boost::uint16_t port, bool get_body,
Expand Down Expand Up @@ -152,7 +154,9 @@ struct http_async_connection
body_generator_function_type generator,
resolver_iterator_pair endpoint_range,
boost::system::error_code const& ec) {
if (!ec) {
if (is_timedout_) {
set_errors(asio::error::timed_out);
} else if (!ec) {
BOOST_ASSERT(delegate_.get() != 0);
delegate_->write(
command_streambuf,
Expand Down Expand Up @@ -191,7 +195,7 @@ struct http_async_connection
body_generator_function_type generator,
boost::system::error_code const& ec,
std::size_t bytes_transferred) {
if (!ec) {
if (!is_timedout_ && !ec) {
if (generator) {
// Here we write some more data that the generator provides, before
// we wait for data from the server.
Expand Down Expand Up @@ -219,7 +223,7 @@ struct http_async_connection
version, get_body, callback, placeholders::error,
placeholders::bytes_transferred)));
} else {
set_errors(ec);
set_errors(is_timedout_ ? asio::error::timed_out : ec);
}
}

Expand All @@ -235,7 +239,8 @@ struct http_async_connection
#else
false && short_read_error;
#endif
if (!ec || ec == boost::asio::error::eof || is_ssl_short_read_error) {
if (!is_timedout_ &&
(!ec || ec == boost::asio::error::eof || is_ssl_short_read_error)) {
logic::tribool parsed_ok;
size_t remainder;
switch (state) {
Expand Down Expand Up @@ -403,7 +408,7 @@ struct http_async_connection
BOOST_ASSERT(false && "Bug, report this to the developers!");
}
} else {
boost::system::system_error error(ec);
boost::system::system_error error(is_timedout_ ? asio::error::timed_out : ec);
this->source_promise.set_exception(boost::copy_exception(error));
this->destination_promise.set_exception(boost::copy_exception(error));
switch (state) {
Expand Down Expand Up @@ -454,6 +459,7 @@ struct http_async_connection

int timeout_;
boost::asio::deadline_timer timer_;
bool is_timedout_;
bool follow_redirect_;
resolver_type& resolver_;
resolve_function resolve_;
Expand Down