walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'master' into LPardue-issue-339

This commit is contained in:
Tatsuhiro Tsujikawa 2015-09-02 02:35:36 +09:00
parent 0c4e26fd24 e2557059e5
commit e7bc269e97
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/h2load.cc
View File

@ -265,10 +265,7 @@ Client::Client(Worker *worker, size_t req_todo)
request_timeout_watcher.data = this; request_timeout_watcher.data = this;
} }
Client::~Client() { Client::~Client() { disconnect(); }
ev_timer_stop(worker->loop, &request_timeout_watcher);
disconnect();
}
int Client::do_read() { return readfn(*this); } int Client::do_read() { return readfn(*this); }
int Client::do_write() { return writefn(*this); } int Client::do_write() { return writefn(*this); }
@ -348,7 +345,7 @@ void Client::fail() {
void Client::disconnect() { void Client::disconnect() {
ev_timer_stop(worker->loop, &conn_inactivity_watcher); ev_timer_stop(worker->loop, &conn_inactivity_watcher);
ev_timer_stop(worker->loop, &conn_active_watcher); ev_timer_stop(worker->loop, &conn_active_watcher);
ev_timer_stop(worker->loop, &request_timeout_watcher);
streams.clear(); streams.clear();
session.reset(); session.reset();
state = CLIENT_IDLE; state = CLIENT_IDLE;