Commit 07d85808 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[5261] Eliminated valgrind errors in libkea-http.

parent 2d2bc63d
......@@ -148,8 +148,12 @@ HttpConnection::acceptorCallback(const boost::system::error_code& ec) {
HTTP_REQUEST_RECEIVE_START)
.arg(getRemoteEndpointAddressAsText())
.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,
shared_from_this()),
this),
request_timeout_, IntervalTimer::ONE_SHOT);
doRead();
}
......
......@@ -19,6 +19,7 @@ HttpConnectionPool::start(const HttpConnectionPtr& connection) {
void
HttpConnectionPool::stop(const HttpConnectionPtr& connection) {
connections_.remove(connection);
connection->close();
}
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