curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-16 17:12:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

http3: fix the HTTP/3 in the request, make alt-svc set right versions

Browse Source 
Closes #4200
This commit is contained in:
Daniel Stenberg 2019-08-07 19:30:53 +02:00
parent 98c3f14871
commit a93b43cde8
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
2 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
lib/http.c
View File

@ -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, static const char *get_http_string(const struct Curl_easy *data,
const struct connectdata *conn) const struct connectdata *conn)
{ {
#ifdef ENABLE_QUIC
if((data->set.httpversion == CURL_HTTP_VERSION_3) ||
(conn->httpversion == 30))
return "3";
#endif
#ifdef USE_NGHTTP2 #ifdef USE_NGHTTP2
if(conn->proto.httpc.h2) if(conn->proto.httpc.h2)
return "2"; return "2";
@ -2005,49 +2011,50 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
the rest of the request in the PERFORM phase. */ the rest of the request in the PERFORM phase. */
*done = TRUE; *done = TRUE;
if(conn->httpversion < 20) { /* unless the connection is re-used and already if(conn->transport != TRNSPRT_QUIC) {
http2 */ if(conn->httpversion < 20) { /* unless the connection is re-used and
switch(conn->negnpn) { already http2 */
case CURL_HTTP_VERSION_2: switch(conn->negnpn) {
conn->httpversion = 20; /* we know we're on HTTP/2 now */ case CURL_HTTP_VERSION_2:
conn->httpversion = 20; /* we know we're on HTTP/2 now */
result = Curl_http2_switched(conn, NULL, 0);
if(result)
return result;
break;
case CURL_HTTP_VERSION_1_1:
/* continue with HTTP/1.1 when explicitly requested */
break;
default:
/* Check if user wants to use HTTP/2 with clear TCP*/
#ifdef USE_NGHTTP2
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. */
infof(data, "Ignoring HTTP/2 prior knowledge due to proxy\n");
break;
}
DEBUGF(infof(data, "HTTP/2 over clean TCP\n"));
conn->httpversion = 20;
result = Curl_http2_switched(conn, NULL, 0); result = Curl_http2_switched(conn, NULL, 0);
if(result) if(result)
return result; return result;
} break;
case CURL_HTTP_VERSION_1_1:
/* continue with HTTP/1.1 when explicitly requested */
break;
default:
/* Check if user wants to use HTTP/2 with clear TCP*/
#ifdef USE_NGHTTP2
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. */
infof(data, "Ignoring HTTP/2 prior knowledge due to proxy\n");
break;
}
DEBUGF(infof(data, "HTTP/2 over clean TCP\n"));
conn->httpversion = 20;
result = Curl_http2_switched(conn, NULL, 0);
if(result)
return result;
}
#endif #endif
break; break;
}
}
else {
/* prepare for a http2 request */
result = Curl_http2_setup(conn);
if(result)
return result;
} }
} }
else {
/* prepare for a http2 request */
result = Curl_http2_setup(conn);
if(result)
return result;
}
http = data->req.protop; http = data->req.protop;
DEBUGASSERT(http); DEBUGASSERT(http);

6
lib/url.c
View File

@ -3195,14 +3195,14 @@ static CURLcode parse_connect_to_slist(struct Curl_easy *data,
/* protocol version switch */ /* protocol version switch */
switch(nalpnid) { switch(nalpnid) {
case ALPN_h1: case ALPN_h1:
conn->httpversion = CURL_HTTP_VERSION_1_1; conn->httpversion = 11;
break; break;
case ALPN_h2: case ALPN_h2:
conn->httpversion = CURL_HTTP_VERSION_2TLS; conn->httpversion = 20;
break; break;
case ALPN_h3: case ALPN_h3:
conn->transport = TRNSPRT_QUIC; conn->transport = TRNSPRT_QUIC;
conn->httpversion = CURL_HTTP_VERSION_3; conn->httpversion = 30;
break; break;
default: /* shouldn't be possible */ default: /* shouldn't be possible */
break; break;