Skip to content

N
nghttp2
Commit 64589750 authored by Tatsuhiro Tsujikawa's avatar Tatsuhiro Tsujikawa
Browse files
Options

nghttpx: Reset buffer on empty

parent fe8f2a46
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
src/shrpx_client_handler.cc
View file @ 64589750
...@@ -156,11 +156,11 @@ int ClientHandler::write_clear() { ...@@ -156,11 +156,11 @@ int ClientHandler::write_clear() {
wlimit_.drain(nwrite); wlimit_.drain(nwrite);
continue; continue;
} }
wb_.reset();
if (on_write() != 0) { if (on_write() != 0) {
return -1; return -1;
} }
if (wb_.rleft() == 0) { if (wb_.rleft() == 0) {
wb_.reset();
break; break;
} }
} }
...@@ -310,6 +310,7 @@ int ClientHandler::write_tls() { ...@@ -310,6 +310,7 @@ int ClientHandler::write_tls() {
continue; continue;
} }
wb_.reset();
if (on_write() != 0) { if (on_write() != 0) {
return -1; return -1;
} }
......
src/shrpx_http2_session.cc
View file @ 64589750
...@@ -1653,11 +1653,11 @@ int Http2Session::write_clear() { ...@@ -1653,11 +1653,11 @@ int Http2Session::write_clear() {
continue; continue;
} }
wb_.reset();
if (on_write() != 0) { if (on_write() != 0) {
return -1; return -1;
} }
if (wb_.rleft() == 0) { if (wb_.rleft() == 0) {
wb_.reset();
break; break;
} }
} }
...@@ -1729,6 +1729,7 @@ int Http2Session::read_tls() { ...@@ -1729,6 +1729,7 @@ int Http2Session::read_tls() {
return -1; return -1;
} }
rb_.reset();
struct iovec iov[2]; struct iovec iov[2];
auto iovcnt = rb_.wiovec(iov); auto iovcnt = rb_.wiovec(iov);
if (iovcnt > 0) { if (iovcnt > 0) {
...@@ -1792,6 +1793,7 @@ int Http2Session::write_tls() { ...@@ -1792,6 +1793,7 @@ int Http2Session::write_tls() {
continue; continue;
} }
wb_.reset();
if (on_write() != 0) { if (on_write() != 0) {
return -1; return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment