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/vtls/polarssl.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/vtls/polarssl.c')
| -rw-r--r-- | lib/vtls/polarssl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/vtls/polarssl.c b/lib/vtls/polarssl.c index 6c7a7864b..aa4da3f6a 100644 --- a/lib/vtls/polarssl.c +++ b/lib/vtls/polarssl.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2012 - 2015, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2012 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 2010 - 2011, Hoi-Ho Chan, <hoiho.chan@gmail.com> * * This software is licensed as described in the file COPYING, which @@ -364,7 +364,7 @@ polarssl_connect_step1(struct connectdata *conn, } #ifdef HAS_ALPN - if(data->set.ssl_enable_alpn) { + if(conn->bits.tls_enable_alpn) { static const char* protocols[3]; int cur = 0; @@ -519,7 +519,7 @@ polarssl_connect_step2(struct connectdata *conn, } #ifdef HAS_ALPN - if(data->set.ssl_enable_alpn) { + if(conn->bits.tls_enable_alpn) { const char *next_protocol = ssl_get_alpn_protocol(&connssl->ssl); if(next_protocol != NULL) { |