moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-11 03:55:03 -05:00
Code Issues Releases Wiki Activity

http: add libcurl option to allow HTTP/2 for HTTPS only

Browse Source 
... and stick to 1.1 for HTTP. This is in line with what browsers do and
should have very little risk.
This commit is contained in:
Daniel Stenberg 2015-12-13 09:23:36 +01:00
parent 7f683b0ea8
commit 4bcc532de5
10 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/libcurl/opts/CURLOPT_HTTP_VERSION.3
View File

@ -45,8 +45,15 @@ Enforce HTTP 1.0 requests.
.IP CURL_HTTP_VERSION_1_1 .IP CURL_HTTP_VERSION_1_1
Enforce HTTP 1.1 requests. Enforce HTTP 1.1 requests.
.IP CURL_HTTP_VERSION_2_0 .IP CURL_HTTP_VERSION_2_0
Attempt HTTP 2 requests. libcurl will fall back to HTTP 1.x if HTTP 2 can't be Attempt HTTP 2 requests. libcurl will fall back to HTTP 1.1 if HTTP 2 can't be
negotiated with the server. (Added in 7.33.0) negotiated with the server. (Added in 7.33.0)
The alias \fICURL_HTTP_VERSION_2\fI was added in 7.43.0 to better reflect the
actual protocol name.
.IP CURL_HTTP_VERSION_2TLS
Attempt HTTP 2 over TLS (HTTPS) only. libcurl will fall back to HTTP 1.1 if
HTTP 2 can't be negotiated with the HTTPS server. For clear text HTTP servers,
libcurl will use 1.1. (Added in 7.47.0)
.SH DEFAULT .SH DEFAULT
CURL_HTTP_VERSION_NONE CURL_HTTP_VERSION_NONE
.SH PROTOCOLS .SH PROTOCOLS

1
docs/libcurl/symbols-in-versions
View File

@ -692,6 +692,7 @@ CURL_HTTP_VERSION_1_0 7.9.1
CURL_HTTP_VERSION_1_1 7.9.1 CURL_HTTP_VERSION_1_1 7.9.1
CURL_HTTP_VERSION_2 7.43.0 CURL_HTTP_VERSION_2 7.43.0
CURL_HTTP_VERSION_2_0 7.33.0 CURL_HTTP_VERSION_2_0 7.33.0
CURL_HTTP_VERSION_2TLS 7.47.0
CURL_HTTP_VERSION_NONE 7.9.1 CURL_HTTP_VERSION_NONE 7.9.1
CURL_IPRESOLVE_V4 7.10.8 CURL_IPRESOLVE_V4 7.10.8
CURL_IPRESOLVE_V6 7.10.8 CURL_IPRESOLVE_V6 7.10.8

3
include/curl/curl.h
View File

@ -1722,7 +1722,8 @@ enum {
for us! */ for us! */
CURL_HTTP_VERSION_1_0, /* please use HTTP 1.0 in the request */ CURL_HTTP_VERSION_1_0, /* please use HTTP 1.0 in the request */
CURL_HTTP_VERSION_1_1, /* please use HTTP 1.1 in the request */ CURL_HTTP_VERSION_1_1, /* please use HTTP 1.1 in the request */
CURL_HTTP_VERSION_2_0, /* please use HTTP 2.0 in the request */ CURL_HTTP_VERSION_2_0, /* please use HTTP 2 in the request */
CURL_HTTP_VERSION_2TLS, /* use version 2 for HTTPS, version 1.1 for HTTP */
CURL_HTTP_VERSION_LAST /* *ILLEGAL* http version */ CURL_HTTP_VERSION_LAST /* *ILLEGAL* http version */
}; };

16
lib/http.c
View File

@ -1539,11 +1539,13 @@ CURLcode Curl_http_done(struct connectdata *conn,
static bool use_http_1_1plus(const struct SessionHandle *data, static bool use_http_1_1plus(const struct SessionHandle *data,
const struct connectdata *conn) const struct connectdata *conn)
{ {
return ((data->set.httpversion >= CURL_HTTP_VERSION_1_1) || if((data->state.httpversion == 10) || (conn->httpversion == 10))
((data->set.httpversion != CURL_HTTP_VERSION_1_0) && return FALSE;
((conn->httpversion == 11) || if((data->set.httpversion == CURL_HTTP_VERSION_1_0) &&
((conn->httpversion != 10) && (conn->httpversion <= 10))
(data->state.httpversion != 10))))) ? TRUE : FALSE; return FALSE;
return ((data->set.httpversion == CURL_HTTP_VERSION_NONE) ||
(data->set.httpversion >= CURL_HTTP_VERSION_1_1));
} }
/* check and possibly add an Expect: header */ /* check and possibly add an Expect: header */
@ -1785,7 +1787,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
if(conn->httpversion < 20) { /* unless the connection is re-used and already if(conn->httpversion < 20) { /* unless the connection is re-used and already
http2 */ http2 */
switch(conn->negnpn) { switch(conn->negnpn) {
case CURL_HTTP_VERSION_2_0: case CURL_HTTP_VERSION_2:
conn->httpversion = 20; /* we know we're on HTTP/2 now */ conn->httpversion = 20; /* we know we're on HTTP/2 now */
result = Curl_http2_init(conn); result = Curl_http2_init(conn);
if(result) if(result)
@ -2338,7 +2340,7 @@ CURLcode Curl_http(struct connectdata *conn, bool *done)
if(!(conn->handler->flags&PROTOPT_SSL) && if(!(conn->handler->flags&PROTOPT_SSL) &&
conn->httpversion != 20 && conn->httpversion != 20 &&
(data->set.httpversion == CURL_HTTP_VERSION_2_0)) { (data->set.httpversion == CURL_HTTP_VERSION_2)) {
/* append HTTP2 upgrade magic stuff to the HTTP request if it isn't done /* append HTTP2 upgrade magic stuff to the HTTP request if it isn't done
over SSL */ over SSL */
result = Curl_http2_request_upgrade(req_buffer, conn); result = Curl_http2_request_upgrade(req_buffer, conn);

4
lib/url.c
View File

@ -1294,7 +1294,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
*/ */
arg = va_arg(param, long); arg = va_arg(param, long);
#ifndef USE_NGHTTP2 #ifndef USE_NGHTTP2
if(arg == CURL_HTTP_VERSION_2_0) if(arg >= CURL_HTTP_VERSION_2)
return CURLE_UNSUPPORTED_PROTOCOL; return CURLE_UNSUPPORTED_PROTOCOL;
#endif #endif
data->set.httpversion = arg; data->set.httpversion = arg;
@ -2865,7 +2865,7 @@ static bool IsPipeliningPossible(const struct SessionHandle *handle,
return TRUE; return TRUE;
if(Curl_pipeline_wanted(handle->multi, CURLPIPE_MULTIPLEX) && if(Curl_pipeline_wanted(handle->multi, CURLPIPE_MULTIPLEX) &&
(handle->set.httpversion == CURL_HTTP_VERSION_2_0)) (handle->set.httpversion >= CURL_HTTP_VERSION_2))
/* allows HTTP/2 */ /* allows HTTP/2 */
return TRUE; return TRUE;
} }

4
lib/vtls/gtls.c
View File

@ -638,7 +638,7 @@ gtls_connect_step1(struct connectdata *conn,
gnutls_datum_t protocols[2]; gnutls_datum_t protocols[2];
#ifdef USE_NGHTTP2 #ifdef USE_NGHTTP2
if(data->set.httpversion == CURL_HTTP_VERSION_2_0) { if(data->set.httpversion >= CURL_HTTP_VERSION_2) {
protocols[cur].data = (unsigned char *)NGHTTP2_PROTO_VERSION_ID; protocols[cur].data = (unsigned char *)NGHTTP2_PROTO_VERSION_ID;
protocols[cur].size = NGHTTP2_PROTO_VERSION_ID_LEN; protocols[cur].size = NGHTTP2_PROTO_VERSION_ID_LEN;
cur++; cur++;
@ -1242,7 +1242,7 @@ gtls_connect_step3(struct connectdata *conn,
if(proto.size == NGHTTP2_PROTO_VERSION_ID_LEN && if(proto.size == NGHTTP2_PROTO_VERSION_ID_LEN &&
!memcmp(NGHTTP2_PROTO_VERSION_ID, proto.data, !memcmp(NGHTTP2_PROTO_VERSION_ID, proto.data,
NGHTTP2_PROTO_VERSION_ID_LEN)) { NGHTTP2_PROTO_VERSION_ID_LEN)) {
conn->negnpn = CURL_HTTP_VERSION_2_0; conn->negnpn = CURL_HTTP_VERSION_2;
} }
else else
#endif #endif

4
lib/vtls/mbedtls.c
View File

@ -374,7 +374,7 @@ mbedtls_connect_step1(struct connectdata *conn,
} }
#ifdef HAS_ALPN #ifdef HAS_ALPN
if(data->set.httpversion == CURL_HTTP_VERSION_2_0) { if(data->set.httpversion >= CURL_HTTP_VERSION_2) {
if(data->set.ssl_enable_alpn) { if(data->set.ssl_enable_alpn) {
static const char* protocols[] = { static const char* protocols[] = {
NGHTTP2_PROTO_VERSION_ID, ALPN_HTTP_1_1, NULL NGHTTP2_PROTO_VERSION_ID, ALPN_HTTP_1_1, NULL
@ -475,7 +475,7 @@ mbedtls_connect_step2(struct connectdata *conn,
if(strncmp(next_protocol, NGHTTP2_PROTO_VERSION_ID, if(strncmp(next_protocol, NGHTTP2_PROTO_VERSION_ID,
NGHTTP2_PROTO_VERSION_ID_LEN)) { NGHTTP2_PROTO_VERSION_ID_LEN)) {
conn->negnpn = CURL_HTTP_VERSION_2_0; conn->negnpn = CURL_HTTP_VERSION_2;
} }
else if(strncmp(next_protocol, ALPN_HTTP_1_1, ALPN_HTTP_1_1_LENGTH)) { else if(strncmp(next_protocol, ALPN_HTTP_1_1, ALPN_HTTP_1_1_LENGTH)) {
conn->negnpn = CURL_HTTP_VERSION_1_1; conn->negnpn = CURL_HTTP_VERSION_1_1;

4
lib/vtls/nss.c
View File

@ -720,7 +720,7 @@ static void HandshakeCallback(PRFileDesc *sock, void *arg)
#ifdef USE_NGHTTP2 #ifdef USE_NGHTTP2
if(buflen == NGHTTP2_PROTO_VERSION_ID_LEN && if(buflen == NGHTTP2_PROTO_VERSION_ID_LEN &&
!memcmp(NGHTTP2_PROTO_VERSION_ID, buf, NGHTTP2_PROTO_VERSION_ID_LEN)) { !memcmp(NGHTTP2_PROTO_VERSION_ID, buf, NGHTTP2_PROTO_VERSION_ID_LEN)) {
conn->negnpn = CURL_HTTP_VERSION_2_0; conn->negnpn = CURL_HTTP_VERSION_2;
} }
else else
#endif #endif
@ -1779,7 +1779,7 @@ static CURLcode nss_setup_connect(struct connectdata *conn, int sockindex)
unsigned char protocols[128]; unsigned char protocols[128];
#ifdef USE_NGHTTP2 #ifdef USE_NGHTTP2
if(data->set.httpversion == CURL_HTTP_VERSION_2_0) { if(data->set.httpversion >= CURL_HTTP_VERSION_2) {
protocols[cur++] = NGHTTP2_PROTO_VERSION_ID_LEN; protocols[cur++] = NGHTTP2_PROTO_VERSION_ID_LEN;
memcpy(&protocols[cur], NGHTTP2_PROTO_VERSION_ID, memcpy(&protocols[cur], NGHTTP2_PROTO_VERSION_ID,
NGHTTP2_PROTO_VERSION_ID_LEN); NGHTTP2_PROTO_VERSION_ID_LEN);

8
lib/vtls/openssl.c
View File

@ -1582,12 +1582,12 @@ select_next_proto_cb(SSL *ssl,
(void)ssl; (void)ssl;
#ifdef USE_NGHTTP2 #ifdef USE_NGHTTP2
if(conn->data->set.httpversion == CURL_HTTP_VERSION_2_0 && if(conn->data->set.httpversion >= CURL_HTTP_VERSION_2 &&
!select_next_protocol(out, outlen, in, inlen, NGHTTP2_PROTO_VERSION_ID, !select_next_protocol(out, outlen, in, inlen, NGHTTP2_PROTO_VERSION_ID,
NGHTTP2_PROTO_VERSION_ID_LEN)) { NGHTTP2_PROTO_VERSION_ID_LEN)) {
infof(conn->data, "NPN, negotiated HTTP2 (%s)\n", infof(conn->data, "NPN, negotiated HTTP2 (%s)\n",
NGHTTP2_PROTO_VERSION_ID); NGHTTP2_PROTO_VERSION_ID);
conn->negnpn = CURL_HTTP_VERSION_2_0; conn->negnpn = CURL_HTTP_VERSION_2;
return SSL_TLSEXT_ERR_OK; return SSL_TLSEXT_ERR_OK;
} }
#endif #endif
@ -1859,7 +1859,7 @@ static CURLcode ossl_connect_step1(struct connectdata *conn, int sockindex)
unsigned char protocols[128]; unsigned char protocols[128];
#ifdef USE_NGHTTP2 #ifdef USE_NGHTTP2
if(data->set.httpversion == CURL_HTTP_VERSION_2_0) { if(data->set.httpversion >= CURL_HTTP_VERSION_2) {
protocols[cur++] = NGHTTP2_PROTO_VERSION_ID_LEN; protocols[cur++] = NGHTTP2_PROTO_VERSION_ID_LEN;
memcpy(&protocols[cur], NGHTTP2_PROTO_VERSION_ID, memcpy(&protocols[cur], NGHTTP2_PROTO_VERSION_ID,
@ -2185,7 +2185,7 @@ static CURLcode ossl_connect_step2(struct connectdata *conn, int sockindex)
#ifdef USE_NGHTTP2 #ifdef USE_NGHTTP2
if(len == NGHTTP2_PROTO_VERSION_ID_LEN && if(len == NGHTTP2_PROTO_VERSION_ID_LEN &&
!memcmp(NGHTTP2_PROTO_VERSION_ID, neg_protocol, len)) { !memcmp(NGHTTP2_PROTO_VERSION_ID, neg_protocol, len)) {
conn->negnpn = CURL_HTTP_VERSION_2_0; conn->negnpn = CURL_HTTP_VERSION_2;
} }
else else
#endif #endif

4
lib/vtls/polarssl.c
View File

@ -359,7 +359,7 @@ polarssl_connect_step1(struct connectdata *conn,
int cur = 0; int cur = 0;
#ifdef USE_NGHTTP2 #ifdef USE_NGHTTP2
if(data->set.httpversion == CURL_HTTP_VERSION_2_0) { if(data->set.httpversion >= CURL_HTTP_VERSION_2) {
protocols[cur++] = NGHTTP2_PROTO_VERSION_ID; protocols[cur++] = NGHTTP2_PROTO_VERSION_ID;
infof(data, "ALPN, offering %s\n", NGHTTP2_PROTO_VERSION_ID); infof(data, "ALPN, offering %s\n", NGHTTP2_PROTO_VERSION_ID);
} }
@ -463,7 +463,7 @@ polarssl_connect_step2(struct connectdata *conn,
#ifdef USE_NGHTTP2 #ifdef USE_NGHTTP2
if(!strncmp(next_protocol, NGHTTP2_PROTO_VERSION_ID, if(!strncmp(next_protocol, NGHTTP2_PROTO_VERSION_ID,
NGHTTP2_PROTO_VERSION_ID_LEN)) { NGHTTP2_PROTO_VERSION_ID_LEN)) {
conn->negnpn = CURL_HTTP_VERSION_2_0; conn->negnpn = CURL_HTTP_VERSION_2;
} }
else else
#endif #endif