From e2557059e5b00c2b45804e6d420a0e956ee71be6 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Wed, 2 Sep 2015 02:34:32 +0900
Subject: [PATCH] h2load: Fix crash with --timing-script option

---
 src/h2load.cc | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/h2load.cc b/src/h2load.cc
index 3f37adc3..446a9d9f 100644
--- a/src/h2load.cc
+++ b/src/h2load.cc
@@ -265,10 +265,7 @@ Client::Client(Worker *worker, size_t req_todo)
   request_timeout_watcher.data = this;
 }
 
-Client::~Client() {
-  ev_timer_stop(worker->loop, &request_timeout_watcher);
-  disconnect();
-}
+Client::~Client() { disconnect(); }
 
 int Client::do_read() { return readfn(*this); }
 int Client::do_write() { return writefn(*this); }
@@ -348,7 +345,7 @@ void Client::fail() {
 void Client::disconnect() {
   ev_timer_stop(worker->loop, &conn_inactivity_watcher);
   ev_timer_stop(worker->loop, &conn_active_watcher);
-
+  ev_timer_stop(worker->loop, &request_timeout_watcher);
   streams.clear();
   session.reset();
   state = CLIENT_IDLE;