diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2015-12-05 00:40:10 +0900 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-12-08 18:40:32 +0100 |
| commit | 12f6bf5e5806d42119638bffc82d3926beca2bec (patch) | |
| tree | e5e3dbe05879c3583048ee6db5622776b2f16e4d | |
| parent | b6d5cb40d7038fe1ed5cda7815a6fe137242289e (diff) | |
http2: Fix hanging paused stream
When NGHTTP2_ERR_PAUSE is returned from data_source_read_callback, we
might not process DATA frame fully. Calling nghttp2_session_mem_recv()
again will continue to process DATA frame, but if there is no incoming
frames, then we have to call it again with 0-length data. Without this,
on_stream_close callback will not be called, and stream could be hanged.
Bug: http://curl.haxx.se/mail/lib-2015-11/0103.html
Reported-by: Francisco Moraes
| -rw-r--r-- | lib/http2.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/http2.c b/lib/http2.c index c4f9a467b..dae7f4a6f 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -1136,6 +1136,15 @@ static ssize_t http2_recv(struct connectdata *conn, int sockindex, stream->pausedata = NULL; stream->pauselen = 0; + + /* When NGHTTP2_ERR_PAUSE is returned from + data_source_read_callback, we might not process DATA frame + fully. Calling nghttp2_session_mem_recv() again will + continue to process DATA frame, but if there is no incoming + frames, then we have to call it again with 0-length data. + Without this, on_stream_close callback will not be called, + and stream could be hanged. */ + nghttp2_session_mem_recv(httpc->h2, NULL, 0); } DEBUGF(infof(data, "http2_recv: returns unpaused %zd bytes on stream %u\n", nread, stream->stream_id)); |