From 15d9da5eb91924ff5d55f741795763da8003334c Mon Sep 17 00:00:00 2001
From: Joe Wilm <joe@jwilm.com>
Date: Thu, 6 Oct 2016 14:02:45 -0700
Subject: [PATCH] fix(client): keep-alive works as intended now

We observed an issue where connection were not ever entering the
keep-alive state due to a bug with `State::update`. The issue is
resolved with resetting the write state to KeepAlive when it arrives as
KeepAlive. Otherwise, it would be marked incorrectly as Closed.

The `trace!` lines in here are useful for debugging keep-alive issues so
I've left them in.
---
 src/http/conn.rs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/http/conn.rs b/src/http/conn.rs
index f8548325..9ea90b85 100644
--- a/src/http/conn.rs
+++ b/src/http/conn.rs
@@ -691,6 +691,7 @@ impl<H: MessageHandler<T>, T: Transport> State<H, T> {
         {
             let timeout = next.timeout;
             let state = mem::replace(self, State::Closed);
+            trace!("State::update state={:?}, interest={:?}", state, next.interest);
             match (state, next.interest) {
                 (_, Next_::Remove) |
                 (State::Closed, _) => return, // Keep State::Closed.
@@ -730,6 +731,10 @@ impl<H: MessageHandler<T>, T: Transport> State<H, T> {
                                         None
                                     }
                                 }
+                                Writing::KeepAlive => {
+                                    writing = Writing::KeepAlive;
+                                    None
+                                }
                                 _ => return, // Keep State::Closed.
                             };
                             if let Some(encoder) = encoder {
@@ -746,6 +751,7 @@ impl<H: MessageHandler<T>, T: Transport> State<H, T> {
                                 }
                             };
 
+                            trace!("(reading, writing) -> {:?}", (&reading, &writing));
                             match (reading, writing) {
                                 (Reading::KeepAlive, Writing::KeepAlive) => {
                                     let next = factory.keep_alive_interest();