# HG changeset patch # User Ruslan Ermilov # Date 1391094792 -14400 # Node ID 2e40188f83ef5bf1ae5afe0dd445689049f46a5c # Parent f385349d584bc5bf4b43258e2351c07a1906bb93 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. diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -713,11 +713,8 @@ ngx_http_ssl_handshake_handler(ngx_conne 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 @@ ngx_http_ssl_handshake_handler(ngx_conne } #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;