From d157744fb2227d78cae25db62aad47176e6fb613 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Fri, 2 Jan 2015 13:42:32 +0900 Subject: [PATCH] nghttpx: Fix handling of pending data --- src/shrpx_http2_session.cc | 2 +- src/shrpx_http2_upstream.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/shrpx_http2_session.cc b/src/shrpx_http2_session.cc index 7fa309f5..c3934b92 100644 --- a/src/shrpx_http2_session.cc +++ b/src/shrpx_http2_session.cc @@ -1417,7 +1417,7 @@ int Http2Session::downstream_write() { auto n = std::min(wb_.wleft(), data_pendinglen_); wb_.write(data_pending_, n); if (n < data_pendinglen_) { - data_pendinglen_ += n; + data_pending_ += n; data_pendinglen_ -= n; return 0; } diff --git a/src/shrpx_http2_upstream.cc b/src/shrpx_http2_upstream.cc index b422600e..1a8e0675 100644 --- a/src/shrpx_http2_upstream.cc +++ b/src/shrpx_http2_upstream.cc @@ -726,7 +726,7 @@ int Http2Upstream::on_write() { auto n = std::min(wb->wleft(), data_pendinglen_); wb->write(data_pending_, n); if (n < data_pendinglen_) { - data_pendinglen_ += n; + data_pending_ += n; data_pendinglen_ -= n; return 0; }