Mercurial > hg > nginx

changeset 7476:b6dc8a12c07a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
SSL: removed redundant "pkey" variable. It was accidentally introduced in 77436d9951a1 (1.15.9). In MSVC 2015 and more recent MSVC versions it triggers warning C4456 (declaration of 'pkey' hides previous local declaration). Previously, all such warnings were resolved in 2a621245f4cf. Reported by Steve Stevenson.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 09 Mar 2019 02:55:43 +0300
parents 49f9d2f7d887
children c74904a17021
files src/event/ngx_event_openssl.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/event/ngx_event_openssl.c
+++ b/src/event/ngx_event_openssl.c
@@ -701,9 +701,8 @@ ngx_ssl_load_certificate_key(ngx_pool_t 
 
 #ifndef OPENSSL_NO_ENGINE
 
-        u_char      *p, *last;
-        ENGINE      *engine;
-        EVP_PKEY    *pkey;
+        u_char  *p, *last;
+        ENGINE  *engine;
 
         p = key->data + sizeof("engine:") - 1;
         last = (u_char *) ngx_strchr(p, ':');