walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttp, h2load: Fix regression introduced in 795a22a 

We missed wb.reset(), which makes write buffer's capacity becomes 0
and communication stalls eventually.
This commit is contained in:
Tatsuhiro Tsujikawa 2015-02-11 21:42:11 +09:00
parent 57d02f5c57
commit 756e2b3e9b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/h2load.cc
View File

@ -534,12 +534,11 @@ int Client::write_clear() {
wb.drain(nwrite); wb.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;
} }
} }
@ -668,6 +667,7 @@ int Client::write_tls() {
continue; continue;
} }
wb.reset();
if (on_write() != 0) { if (on_write() != 0) {
return -1; return -1;
} }

4
src/nghttp.cc
View File

@ -666,12 +666,11 @@ int HttpClient::write_clear() {
wb.drain(nwrite); wb.drain(nwrite);
continue; continue;
} }
wb.reset();
if (on_writefn(*this) != 0) { if (on_writefn(*this) != 0) {
return -1; return -1;
} }
if (wb.rleft() == 0) { if (wb.rleft() == 0) {
wb.reset();
break; break;
} }
} }
@ -1169,6 +1168,7 @@ int HttpClient::write_tls() {
continue; continue;
} }
wb.reset();
if (on_writefn(*this) != 0) { if (on_writefn(*this) != 0) {
return -1; return -1;
} }