diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2015-12-13 09:23:36 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-12-13 09:24:51 +0100 |
| commit | 4bcc532de5b639ace6f96f0a30524a08861843b1 (patch) | |
| tree | 8d808958c1a58f54b1d29ca68dbe9baaef752d57 /lib/vtls/gtls.c | |
| parent | 7f683b0ea87ed158eb4bd22cdd1f26eb901a97d0 (diff) | |
http: add libcurl option to allow HTTP/2 for HTTPS only
... and stick to 1.1 for HTTP. This is in line with what browsers do and
should have very little risk.
Diffstat (limited to 'lib/vtls/gtls.c')
| -rw-r--r-- | lib/vtls/gtls.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c index 1c1cc2f7b..59cd7fb11 100644 --- a/lib/vtls/gtls.c +++ b/lib/vtls/gtls.c @@ -638,7 +638,7 @@ gtls_connect_step1(struct connectdata *conn, gnutls_datum_t protocols[2]; #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].size = NGHTTP2_PROTO_VERSION_ID_LEN; cur++; @@ -1242,7 +1242,7 @@ gtls_connect_step3(struct connectdata *conn, if(proto.size == NGHTTP2_PROTO_VERSION_ID_LEN && !memcmp(NGHTTP2_PROTO_VERSION_ID, proto.data, NGHTTP2_PROTO_VERSION_ID_LEN)) { - conn->negnpn = CURL_HTTP_VERSION_2_0; + conn->negnpn = CURL_HTTP_VERSION_2; } else #endif |