diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2014-01-30 19:13:12 +0400 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2014-01-30 19:13:12 +0400 |
| commit | c6d7db25000b532c6c8588ff5ed8f83110b0aa82 (patch) | |
| tree | 709b5adbfcd676740315a5b2d9fc26e2e21143cf /src/http/ngx_http_request.c | |
| parent | 8d288ec49ae1e7087732562d142fdfc257ac5541 (diff) | |
| download | nginx-c6d7db25000b532c6c8588ff5ed8f83110b0aa82.tar.gz nginx-c6d7db25000b532c6c8588ff5ed8f83110b0aa82.zip | |
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.
Diffstat (limited to 'src/http/ngx_http_request.c')
| -rw-r--r-- | src/http/ngx_http_request.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index a882cca5b..a0e6fadb6 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -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; |