Mercurial > hg > nginx
changeset 5547:2e40188f83ef
Fixed a compile warning introduced by 01e2a5bcdd8f.
On systems with OpenSSL that has NPN support but lacks
ALPN support, some compilers emitted a warning about
possibly uninitialized "data" variable.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Thu, 30 Jan 2014 19:13:12 +0400 |
parents | f385349d584b |
children | 4d47722d76b2 |
files | src/http/ngx_http_request.c |
diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_request.c Thu Jan 30 18:57:11 2014 +0400 +++ b/src/http/ngx_http_request.c Thu Jan 30 19:13:12 2014 +0400 @@ -713,11 +713,8 @@ const unsigned char *data; static const ngx_str_t spdy = ngx_string(NGX_SPDY_NPN_NEGOTIATED); - len = 0; - #ifdef TLSEXT_TYPE_application_layer_protocol_negotiation SSL_get0_alpn_selected(c->ssl->connection, &data, &len); -#endif #ifdef TLSEXT_TYPE_next_proto_neg if (len == 0) { @@ -725,6 +722,10 @@ } #endif +#else /* TLSEXT_TYPE_next_proto_neg */ + SSL_get0_next_proto_negotiated(c->ssl->connection, &data, &len); +#endif + if (len == spdy.len && ngx_strncmp(data, spdy.data, spdy.len) == 0) { ngx_http_spdy_init(c->read); return;