From 0a4330ee3c7889524f7feba4a9c89683929cd776 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Fri, 2 Jan 2015 13:42:57 +0900
Subject: [PATCH] nghttpd: Fix handling pending data and rename rb_ as wb_

---
 src/HttpServer.cc | 45 +++++++++++++++++++++++++--------------------
 src/HttpServer.h  |  4 ++--
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/HttpServer.cc b/src/HttpServer.cc
index 632254cf..a4fcc48b 100644
--- a/src/HttpServer.cc
+++ b/src/HttpServer.cc
@@ -375,11 +375,16 @@ struct ev_loop *Http2Handler::get_loop() const {
 
 int Http2Handler::setup_bev() { return 0; }
 
-int Http2Handler::fill_rb() {
+int Http2Handler::fill_wb() {
   if (data_pending_) {
-    assert(rb_.wleft() >= data_pendinglen_);
+    auto n = std::min(wb_.wleft(), data_pendinglen_);
+    wb_.write(data_pending_, n);
+    if (n < data_pendinglen_) {
+      data_pending_ += n;
+      data_pendinglen_ -= n;
+      return 0;
+    }
 
-    rb_.write(data_pending_, data_pendinglen_);
     data_pending_ = nullptr;
     data_pendinglen_ = 0;
   }
@@ -396,7 +401,7 @@ int Http2Handler::fill_rb() {
     if (datalen == 0) {
       break;
     }
-    auto n = rb_.write(data, datalen);
+    auto n = wb_.write(data, datalen);
     if (n < static_cast<decltype(n)>(datalen)) {
       data_pending_ = data + n;
       data_pendinglen_ = datalen - n;
@@ -437,9 +442,9 @@ int Http2Handler::read_clear() {
 int Http2Handler::write_clear() {
   auto loop = sessions_->get_loop();
   for (;;) {
-    if (rb_.rleft() > 0) {
+    if (wb_.rleft() > 0) {
       struct iovec iov[2];
-      auto iovcnt = rb_.riovec(iov);
+      auto iovcnt = wb_.riovec(iov);
 
       ssize_t nwrite;
       while ((nwrite = writev(fd_, iov, iovcnt)) == -1 && errno == EINTR)
@@ -451,26 +456,26 @@ int Http2Handler::write_clear() {
         }
         return -1;
       }
-      rb_.drain(nwrite);
+      wb_.drain(nwrite);
       continue;
     }
-    rb_.reset();
-    if (fill_rb() != 0) {
+    wb_.reset();
+    if (fill_wb() != 0) {
       return -1;
     }
-    if (rb_.rleft() == 0) {
+    if (wb_.rleft() == 0) {
       break;
     }
   }
 
-  if (rb_.rleft() == 0) {
+  if (wb_.rleft() == 0) {
     ev_io_stop(loop, &wev_);
   } else {
     ev_io_start(loop, &wev_);
   }
 
   if (nghttp2_session_want_read(session_) == 0 &&
-      nghttp2_session_want_write(session_) == 0 && rb_.rleft() == 0) {
+      nghttp2_session_want_write(session_) == 0 && wb_.rleft() == 0) {
     return -1;
   }
 
@@ -556,10 +561,10 @@ fin:
 int Http2Handler::write_tls() {
   auto loop = sessions_->get_loop();
   for (;;) {
-    if (rb_.rleft() > 0) {
+    if (wb_.rleft() > 0) {
       const void *p;
       size_t len;
-      std::tie(p, len) = rb_.get();
+      std::tie(p, len) = wb_.get();
 
       auto rv = SSL_write(ssl_, p, len);
 
@@ -581,26 +586,26 @@ int Http2Handler::write_tls() {
         }
       }
 
-      rb_.drain(rv);
+      wb_.drain(rv);
       continue;
     }
-    rb_.reset();
-    if (fill_rb() != 0) {
+    wb_.reset();
+    if (fill_wb() != 0) {
       return -1;
     }
-    if (rb_.rleft() == 0) {
+    if (wb_.rleft() == 0) {
       break;
     }
   }
 
-  if (rb_.rleft() == 0) {
+  if (wb_.rleft() == 0) {
     ev_io_stop(loop, &wev_);
   } else {
     ev_io_start(loop, &wev_);
   }
 
   if (nghttp2_session_want_read(session_) == 0 &&
-      nghttp2_session_want_write(session_) == 0 && rb_.rleft() == 0) {
+      nghttp2_session_want_write(session_) == 0 && wb_.rleft() == 0) {
     return -1;
   }
 
diff --git a/src/HttpServer.h b/src/HttpServer.h
index fb66d9e3..3e2d7e60 100644
--- a/src/HttpServer.h
+++ b/src/HttpServer.h
@@ -126,7 +126,7 @@ public:
   void remove_settings_timer();
   void terminate_session(uint32_t error_code);
 
-  int fill_rb();
+  int fill_wb();
 
   int read_clear();
   int write_clear();
@@ -141,7 +141,7 @@ private:
   ev_io rev_;
   ev_timer settings_timerev_;
   std::map<int32_t, std::unique_ptr<Stream>> id2stream_;
-  RingBuf<16384> rb_;
+  RingBuf<16384> wb_;
   std::function<int(Http2Handler &)> read_, write_;
   int64_t session_id_;
   nghttp2_session *session_;