diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2016-02-17 21:36:59 +0900 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2016-04-11 21:43:24 -0400 |
| commit | 92c2a4c053f75bbfe8434379dbdd6acd714a2252 (patch) | |
| tree | 8e9ddd90b90500e33da0cf006a11ee6b18b47334 /lib | |
| parent | b2a0376350cb4f788ca2cdff2e89a23bdc789888 (diff) | |
http2: Add handling stream level error
Previously, when a stream was closed with other than NGHTTP2_NO_ERROR
by RST_STREAM, underlying TCP connection was dropped. This is
undesirable since there may be other streams multiplexed and they are
very much fine. This change introduce new error code
CURLE_HTTP2_STREAM, which indicates stream error that only affects the
relevant stream, and connection should be kept open. The existing
CURLE_HTTP2 means connection error in general.
Ref: https://github.com/curl/curl/issues/659
Ref: https://github.com/curl/curl/pull/663
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/http2.c | 9 | ||||
| -rw-r--r-- | lib/multi.c | 3 | ||||
| -rw-r--r-- | lib/strerror.c | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/lib/http2.c b/lib/http2.c index 8f19ebaee..e15237e77 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -1059,7 +1059,7 @@ static ssize_t http2_handle_stream_close(struct connectdata *conn, if(stream->error_code != NGHTTP2_NO_ERROR) { failf(data, "HTTP/2 stream %u was not closed cleanly: error_code = %d", stream->stream_id, stream->error_code); - *err = CURLE_HTTP2; + *err = CURLE_HTTP2_STREAM; return -1; } @@ -1231,6 +1231,13 @@ static ssize_t http2_recv(struct connectdata *conn, int sockindex, *err = CURLE_AGAIN; return -1; } + else if(!nghttp2_session_want_read(httpc->h2) && + !nghttp2_session_want_write(httpc->h2)) { + DEBUGF(infof(data, + "http2_recv: nothing to do in this session\n")); + *err = CURLE_HTTP2; + return -1; + } else { char *inbuf; /* remember where to store incoming data for this stream and how big the diff --git a/lib/multi.c b/lib/multi.c index 8c69e37a5..b1c1f5396 100644 --- a/lib/multi.c +++ b/lib/multi.c @@ -1880,7 +1880,8 @@ static CURLMcode multi_runsingle(struct Curl_multi *multi, * happened in the data connection. */ - if(!(data->easy_conn->handler->flags & PROTOPT_DUAL)) + if(!(data->easy_conn->handler->flags & PROTOPT_DUAL) && + result != CURLE_HTTP2_STREAM) connclose(data->easy_conn, "Transfer returned error"); Curl_posttransfer(data); diff --git a/lib/strerror.c b/lib/strerror.c index cf1a04781..ac616f2c8 100644 --- a/lib/strerror.c +++ b/lib/strerror.c @@ -305,6 +305,9 @@ curl_easy_strerror(CURLcode error) case CURLE_SSL_INVALIDCERTSTATUS: return "SSL server certificate status verification FAILED"; + case CURLE_HTTP2_STREAM: + return "Stream error in the HTTP/2 framing layer"; + /* error codes not used by current libcurl */ case CURLE_OBSOLETE20: case CURLE_OBSOLETE24: |