From 20e63151a5ebecfc264199252aef3b2285ed1b91 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Wed, 15 Jul 2015 23:18:32 +0900
Subject: [PATCH] nghttpx: Fix bug that idle timer is used after reuse

---
 src/shrpx_http_downstream_connection.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/shrpx_http_downstream_connection.cc b/src/shrpx_http_downstream_connection.cc
index af16ba24..eeff9312 100644
--- a/src/shrpx_http_downstream_connection.cc
+++ b/src/shrpx_http_downstream_connection.cc
@@ -205,6 +205,8 @@ int HttpDownstreamConnection::attach_downstream(Downstream *downstream) {
   ev_set_cb(&conn_.rev, readcb);
 
   conn_.rt.repeat = get_config()->downstream_read_timeout;
+  // we may set read timer cb to idle_timeoutcb.  Reset again.
+  ev_set_cb(&conn_.rt, timeoutcb);
   ev_timer_again(conn_.loop, &conn_.rt);
   // TODO we should have timeout for connection establishment
   ev_timer_again(conn_.loop, &conn_.wt);