mirror of
https://github.com/nginx/nginx.git
synced 2025-01-19 01:42:58 +08:00
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.
This commit is contained in:
parent
8d288ec49a
commit
c6d7db2500
@ -713,11 +713,8 @@ ngx_http_ssl_handshake_handler(ngx_connection_t *c)
|
||||
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_connection_t *c)
|
||||
}
|
||||
#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;
|
||||
|
Loading…
Reference in New Issue
Block a user