generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

http2: Fix hanging paused stream

Browse Source 
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
This commit is contained in:
Tatsuhiro Tsujikawa 2015-12-05 00:40:10 +09:00 committed by Daniel Stenberg
parent b6d5cb40d7
commit 12f6bf5e58
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/http2.c
View File

@ -1136,6 +1136,15 @@ static ssize_t http2_recv(struct connectdata *conn, int sockindex,
stream->pausedata = NULL; stream->pausedata = NULL;
stream->pauselen = 0; 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", DEBUGF(infof(data, "http2_recv: returns unpaused %zd bytes on stream %u\n",
nread, stream->stream_id)); nread, stream->stream_id));