diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2018-12-07 17:04:39 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-12-08 10:59:23 +0100 |
| commit | d997aa0e963c5be5de100dccdc5208d39bd3d62b (patch) | |
| tree | f8b002f3eefc58c89bd176c17ef39fc7270565ac /lib/http2.c | |
| parent | 07e61abdac949dda7ff8ab152ed6eb8854db8484 (diff) | |
| download | curl-d997aa0e963c5be5de100dccdc5208d39bd3d62b.tar.gz | |
Upon HTTP_1_1_REQUIRED, retry the request with HTTP/1.1
This is a companion patch to cbea2fd2c (NTLM: force the connection to
HTTP/1.1, 2018-12-06): with NTLM, we can switch to HTTP/1.1
preemptively. However, with other (Negotiate) authentication it is not
clear to this developer whether there is a way to make it work with
HTTP/2, so let's try HTTP/2 first and fall back in case we encounter the
error HTTP_1_1_REQUIRED.
Note: we will still keep the NTLM workaround, as it avoids an extra
round trip.
Daniel Stenberg helped a lot with this patch, in particular by
suggesting to introduce the Curl_h2_http_1_1_error() function.
Closes #3349
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Diffstat (limited to 'lib/http2.c')
| -rw-r--r-- | lib/http2.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/http2.c b/lib/http2.c index c33bee3eb..a61d8c240 100644 --- a/lib/http2.c +++ b/lib/http2.c @@ -2367,6 +2367,14 @@ void Curl_http2_cleanup_dependencies(struct Curl_easy *data) Curl_http2_remove_child(data->set.stream_depends_on, data); } +/* Only call this function for a transfer that already got a HTTP/2 + CURLE_HTTP2_STREAM error! */ +bool Curl_h2_http_1_1_error(struct connectdata *conn) +{ + struct http_conn *httpc = &conn->proto.httpc; + return (httpc->error_code == NGHTTP2_HTTP_1_1_REQUIRED); +} + #else /* !USE_NGHTTP2 */ /* Satisfy external references even if http2 is not compiled in. */ |