]> git.kaiwu.me - nginx.git/commitdiff
Fixed a compile warning introduced by 01e2a5bcdd8f.
authorRuslan Ermilov <ru@nginx.com>
Thu, 30 Jan 2014 15:13:12 +0000 (19:13 +0400)
committerRuslan Ermilov <ru@nginx.com>
Thu, 30 Jan 2014 15:13:12 +0000 (19:13 +0400)
On systems with OpenSSL that has NPN support but lacks
ALPN support, some compilers emitted a warning about
possibly uninitialized "data" variable.

src/http/ngx_http_request.c

index a882cca5b6382fe30e46ce6b21cd4ae298e50358..a0e6fadb6352b0e0332fc8d1315801e51a17f5f5 100644 (file)
@@ -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;