mirror of
https://github.com/moparisthebest/curl
synced 2024-08-13 17:03:50 -04:00
http3: fix the HTTP/3 in the request, make alt-svc set right versions
Closes #4200
This commit is contained in:
parent
98c3f14871
commit
a93b43cde8
17
lib/http.c
17
lib/http.c
@ -1666,6 +1666,12 @@ static bool use_http_1_1plus(const struct Curl_easy *data,
|
||||
static const char *get_http_string(const struct Curl_easy *data,
|
||||
const struct connectdata *conn)
|
||||
{
|
||||
#ifdef ENABLE_QUIC
|
||||
if((data->set.httpversion == CURL_HTTP_VERSION_3) ||
|
||||
(conn->httpversion == 30))
|
||||
return "3";
|
||||
#endif
|
||||
|
||||
#ifdef USE_NGHTTP2
|
||||
if(conn->proto.httpc.h2)
|
||||
return "2";
|
||||
@ -2005,8 +2011,9 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
|
||||
the rest of the request in the PERFORM phase. */
|
||||
*done = TRUE;
|
||||
|
||||
if(conn->httpversion < 20) { /* unless the connection is re-used and already
|
||||
http2 */
|
||||
if(conn->transport != TRNSPRT_QUIC) {
|
||||
if(conn->httpversion < 20) { /* unless the connection is re-used and
|
||||
already http2 */
|
||||
switch(conn->negnpn) {
|
||||
case CURL_HTTP_VERSION_2:
|
||||
conn->httpversion = 20; /* we know we're on HTTP/2 now */
|
||||
@ -2024,8 +2031,8 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
|
||||
if(conn->data->set.httpversion ==
|
||||
CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE) {
|
||||
if(conn->bits.httpproxy && !conn->bits.tunnel_proxy) {
|
||||
/* We don't support HTTP/2 proxies yet. Also it's debatable whether
|
||||
or not this setting should apply to HTTP/2 proxies. */
|
||||
/* We don't support HTTP/2 proxies yet. Also it's debatable
|
||||
whether or not this setting should apply to HTTP/2 proxies. */
|
||||
infof(data, "Ignoring HTTP/2 prior knowledge due to proxy\n");
|
||||
break;
|
||||
}
|
||||
@ -2047,7 +2054,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
|
||||
if(result)
|
||||
return result;
|
||||
}
|
||||
|
||||
}
|
||||
http = data->req.protop;
|
||||
DEBUGASSERT(http);
|
||||
|
||||
|
@ -3195,14 +3195,14 @@ static CURLcode parse_connect_to_slist(struct Curl_easy *data,
|
||||
/* protocol version switch */
|
||||
switch(nalpnid) {
|
||||
case ALPN_h1:
|
||||
conn->httpversion = CURL_HTTP_VERSION_1_1;
|
||||
conn->httpversion = 11;
|
||||
break;
|
||||
case ALPN_h2:
|
||||
conn->httpversion = CURL_HTTP_VERSION_2TLS;
|
||||
conn->httpversion = 20;
|
||||
break;
|
||||
case ALPN_h3:
|
||||
conn->transport = TRNSPRT_QUIC;
|
||||
conn->httpversion = CURL_HTTP_VERSION_3;
|
||||
conn->httpversion = 30;
|
||||
break;
|
||||
default: /* shouldn't be possible */
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user