moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

http2: Fix streams get stuck 

This commit fixes the bug that streams get stuck if stream gets some
DATA, and stream->closed becomes true at the same time.  Previously,
in this condition, after we processed DATA, we are going to try to
read data from underlying transport, but there is no data, and gets
EAGAIN.  There was no code path to evaludate stream->closed.
This commit is contained in:
Tatsuhiro Tsujikawa 2015-05-07 14:51:32 +09:00 committed by Daniel Stenberg
parent 74a4bd5ecd
commit d261652d42
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/http2.c
View File

@ -762,6 +762,21 @@ CURLcode Curl_http2_request_upgrade(Curl_send_buffer *req,
return result;
}
static ssize_t http2_handle_stream_close(struct SessionHandle *data,
struct HTTP *stream, CURLcode *err) {
/* Reset to FALSE to prevent infinite loop in readwrite_data
function. */
stream->closed = FALSE;
if(stream->error_code != NGHTTP2_NO_ERROR) {
failf(data, "HTTP/2 stream = %x was not closed cleanly: error_code = %d",
stream->stream_id, stream->error_code);
*err = CURLE_HTTP2;
return -1;
}
DEBUGF(infof(data, "http2_recv returns 0\n"));
return 0;
}
/*
* If the read would block (EWOULDBLOCK) we return -1. Otherwise we return
* a regular CURLcode value.
@ -778,15 +793,13 @@ static ssize_t http2_recv(struct connectdata *conn, int sockindex,
(void)sockindex; /* we always do HTTP2 on sockindex 0 */
#if 0
if(stream->closed) {
/* Reset to FALSE to prevent infinite loop in readwrite_data
function. */
stream->closed = FALSE;
DEBUGF(infof(data, "http2_recv2 stream found closed?\n"));
return 0;
/* If stream is closed, return 0 to signal the http routine to close
the connection. We need to handle stream closure here,
otherwise, we may be going to read from underlying connection,
and gets EAGAIN, and we will get stuck there. */
if(stream->memlen == 0 && stream->closed) {
return http2_handle_stream_close(data, stream, err);
}
#endif
/* Nullify here because we call nghttp2_session_send() and they
might refer to the old buffer. */
@ -905,18 +918,7 @@ static ssize_t http2_recv(struct connectdata *conn, int sockindex,
/* If stream is closed, return 0 to signal the http routine to close
the connection */
if(stream->closed) {
/* Reset to FALSE to prevent infinite loop in readwrite_data
function. */
stream->closed = FALSE;
if(stream->error_code != NGHTTP2_NO_ERROR) {
failf(data,
"HTTP/2 stream = %x was not closed cleanly: error_code = %d",
stream->stream_id, stream->error_code);
*err = CURLE_HTTP2;
return -1;
}
DEBUGF(infof(data, "http2_recv returns 0\n"));
return 0;
return http2_handle_stream_close(data, stream, err);
}
*err = CURLE_AGAIN;
DEBUGF(infof(data, "http2_recv returns -1, AGAIN\n"));