Commit 34addef4 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[master] Merge branch 'trac5261'

parents 0ce848c0 07d85808
...@@ -148,8 +148,12 @@ HttpConnection::acceptorCallback(const boost::system::error_code& ec) { ...@@ -148,8 +148,12 @@ HttpConnection::acceptorCallback(const boost::system::error_code& ec) {
HTTP_REQUEST_RECEIVE_START) HTTP_REQUEST_RECEIVE_START)
.arg(getRemoteEndpointAddressAsText()) .arg(getRemoteEndpointAddressAsText())
.arg(static_cast<unsigned>(request_timeout_/1000)); .arg(static_cast<unsigned>(request_timeout_/1000));
// Pass raw pointer rather than shared_ptr to this object,
// because IntervalTimer already passes shared pointer to the
// IntervalTimerImpl to make sure that the callback remains
// valid.
request_timer_.setup(boost::bind(&HttpConnection::requestTimeoutCallback, request_timer_.setup(boost::bind(&HttpConnection::requestTimeoutCallback,
shared_from_this()), this),
request_timeout_, IntervalTimer::ONE_SHOT); request_timeout_, IntervalTimer::ONE_SHOT);
doRead(); doRead();
} }
......
...@@ -19,6 +19,7 @@ HttpConnectionPool::start(const HttpConnectionPtr& connection) { ...@@ -19,6 +19,7 @@ HttpConnectionPool::start(const HttpConnectionPtr& connection) {
void void
HttpConnectionPool::stop(const HttpConnectionPtr& connection) { HttpConnectionPool::stop(const HttpConnectionPtr& connection) {
connections_.remove(connection); connections_.remove(connection);
connection->close();
} }
void void
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment