From 26160b47bf42fe43ebccb36ecbc029e4cdbace36 Mon Sep 17 00:00:00 2001
From: mrpre <mrpre@163.com>
Date: Tue, 25 Jun 2019 11:21:08 +0800
Subject: [PATCH] fix stream_sni in Tengine 2.3.1

---
 src/stream/ngx_stream.c             | 4 ++--
 src/stream/ngx_stream_core_module.c | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/stream/ngx_stream.c b/src/stream/ngx_stream.c
index 68c816687a..7442063ef1 100755
--- a/src/stream/ngx_stream.c
+++ b/src/stream/ngx_stream.c
@@ -601,8 +601,8 @@ ngx_stream_add_ports(ngx_conf_t *cf, ngx_array_t *ports,
     addr = port->addrs.elts;
 
     for (i = 0; i < port->addrs.nelts; i++) {
-        if (ngx_cmp_sockaddr(&listen->sockaddr.sockaddr, listen->socklen,
-            &addr[i].opt.sockaddr.sockaddr,
+        if (ngx_cmp_sockaddr(listen->sockaddr, listen->socklen,
+            addr[i].opt.sockaddr,
             addr[i].opt.socklen, 0)
             != NGX_OK)
         {
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index cb142ba29a..04ff81876d 100755
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -944,9 +944,6 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             return "\"proxy_protocol\" parameter is incompatible with \"udp\"";
         }
     }
-#if (NGX_STREAM_SNI)
-    return NGX_CONF_OK;
-#endif
 
     als = cmcf->listen.elts;
 
@@ -958,6 +955,10 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         ls[n].addr_text = u.addrs[n].name;
         ls[n].wildcard = ngx_inet_wildcard(ls[n].sockaddr);
 
+#if (NGX_STREAM_SNI)
+        continue;
+#endif
+
         for (i = 0; i < cmcf->listen.nelts - u.naddrs + n; i++) {
             if (ls[n].type != als[i].type) {
                 continue;