diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2016-05-09 16:50:11 +0200 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2016-05-09 15:30:25 -0400 |
| commit | f6767f5435f4c8230b382f18d4a2917ae37641d5 (patch) | |
| tree | 40839e6a1367ede5506d77484a7b30e818d4709c /lib/http.c | |
| parent | 5bf5f6ebfcede78ef7c2b16daa41c4b7ba266087 (diff) | |
| download | curl-f6767f5435f4c8230b382f18d4a2917ae37641d5.tar.gz | |
TLS: move the ALPN/NPN enable bits to the connection
Only protocols that actually have a protocol registered for ALPN and NPN
should try to get that negotiated in the TLS handshake. That is only
HTTPS (well, http/1.1 and http/2) right now. Previously ALPN and NPN
would wrongly be used in all handshakes if libcurl was built with it
enabled.
Reported-by: Jay Satiro
Fixes #789
Diffstat (limited to 'lib/http.c')
| -rw-r--r-- | lib/http.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/http.c b/lib/http.c index 2a7280dba..6a76b88ed 100644 --- a/lib/http.c +++ b/lib/http.c @@ -145,7 +145,7 @@ const struct Curl_handler Curl_handler_https = { ZERO_NULL, /* readwrite */ PORT_HTTPS, /* defport */ CURLPROTO_HTTPS, /* protocol */ - PROTOPT_SSL | PROTOPT_CREDSPERREQUEST /* flags */ + PROTOPT_SSL | PROTOPT_CREDSPERREQUEST | PROTOPT_ALPN_NPN /* flags */ }; #endif |