From b75455dd96be6f312b6be293ddd53b4b957a01a3 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Wed, 30 Oct 2013 00:10:28 +0900
Subject: [PATCH] nghttpx: Remove recv data length calculation in HTTP/2 code

---
 src/shrpx_http2_upstream.cc             |  4 ----
 src/shrpx_spdy_downstream_connection.cc | 15 +--------------
 src/shrpx_spdy_downstream_connection.h  |  4 ----
 src/shrpx_spdy_session.cc               |  4 ----
 4 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/src/shrpx_http2_upstream.cc b/src/shrpx_http2_upstream.cc
index 513c0e21..f45e75ec 100644
--- a/src/shrpx_http2_upstream.cc
+++ b/src/shrpx_http2_upstream.cc
@@ -307,9 +307,6 @@ int on_data_chunk_recv_callback(nghttp2_session *session,
       upstream->rst_stream(downstream, NGHTTP2_INTERNAL_ERROR);
       return 0;
     }
-    if(upstream->get_flow_control()) {
-      downstream->inc_recv_window_size(len);
-    }
   }
   return 0;
 }
@@ -730,7 +727,6 @@ int Http2Upstream::window_update(Downstream *downstream,
   rv = nghttp2_submit_window_update(session_, NGHTTP2_FLAG_NONE,
                                     downstream->get_stream_id(),
                                     window_size_increment);
-  downstream->set_recv_window_size(0);
   if(rv < NGHTTP2_ERR_FATAL) {
     ULOG(FATAL, this) << "nghttp2_submit_window_update() failed: "
                       << nghttp2_strerror(rv);
diff --git a/src/shrpx_spdy_downstream_connection.cc b/src/shrpx_spdy_downstream_connection.cc
index a9b76379..5fa6f75f 100644
--- a/src/shrpx_spdy_downstream_connection.cc
+++ b/src/shrpx_spdy_downstream_connection.cc
@@ -51,8 +51,7 @@ SpdyDownstreamConnection::SpdyDownstreamConnection
   : DownstreamConnection(client_handler),
     spdy_(client_handler->get_spdy_session()),
     request_body_buf_(0),
-    sd_(0),
-    recv_window_size_(0)
+    sd_(0)
 {}
 
 SpdyDownstreamConnection::~SpdyDownstreamConnection()
@@ -112,7 +111,6 @@ int SpdyDownstreamConnection::attach_downstream(Downstream *downstream)
   }
   downstream->set_downstream_connection(this);
   downstream_ = downstream;
-  recv_window_size_ = 0;
   return 0;
 }
 
@@ -454,7 +452,6 @@ int SpdyDownstreamConnection::resume_read(IOCtrlReason reason)
         return -1;
       }
       spdy_->notify();
-      recv_window_size_ = 0;
     }
   }
   return 0;
@@ -509,14 +506,4 @@ bool SpdyDownstreamConnection::get_output_buffer_full()
   }
 }
 
-int32_t SpdyDownstreamConnection::get_recv_window_size() const
-{
-  return recv_window_size_;
-}
-
-void SpdyDownstreamConnection::inc_recv_window_size(int32_t amount)
-{
-  recv_window_size_ += amount;
-}
-
 } // namespace shrpx
diff --git a/src/shrpx_spdy_downstream_connection.h b/src/shrpx_spdy_downstream_connection.h
index 92b19b85..74e6fcf3 100644
--- a/src/shrpx_spdy_downstream_connection.h
+++ b/src/shrpx_spdy_downstream_connection.h
@@ -69,14 +69,10 @@ public:
   StreamData* detach_stream_data();
 
   int submit_rst_stream(Downstream *downstream);
-
-  int32_t get_recv_window_size() const;
-  void inc_recv_window_size(int32_t amount);
 private:
   SpdySession *spdy_;
   evbuffer *request_body_buf_;
   StreamData *sd_;
-  int32_t recv_window_size_;
 };
 
 } // namespace shrpx
diff --git a/src/shrpx_spdy_session.cc b/src/shrpx_spdy_session.cc
index 5e2c73a4..b274b991 100644
--- a/src/shrpx_spdy_session.cc
+++ b/src/shrpx_spdy_session.cc
@@ -935,10 +935,6 @@ int on_data_chunk_recv_callback(nghttp2_session *session,
     return 0;
   }
 
-  if(spdy->get_flow_control()) {
-    sd->dconn->inc_recv_window_size(len);
-  }
-
   auto upstream = downstream->get_upstream();
   rv = upstream->on_downstream_body(downstream, data, len);
   if(rv != 0) {