# HG changeset patch # User Ruslan Ermilov # Date 1506075049 -10800 # Node ID 3b1b81e248bcf51a94a82e9201f8dbf36a1355ed # Parent 4a670c18e5e6c5c79d0c0304f6e8203343e7ba0c Do not use the obsolete NGX_SOCKADDRLEN macro. The change in ac120e797d28 re-used the macro which was made obsolete in adf25b8d0431. diff -r 4a670c18e5e6 -r 3b1b81e248bc src/http/modules/ngx_http_upstream_zone_module.c --- a/src/http/modules/ngx_http_upstream_zone_module.c Mon Sep 18 11:09:41 2017 +0300 +++ b/src/http/modules/ngx_http_upstream_zone_module.c Fri Sep 22 13:10:49 2017 +0300 @@ -281,7 +281,7 @@ dst->server.data = NULL; } - dst->sockaddr = ngx_slab_calloc_locked(pool, NGX_SOCKADDRLEN); + dst->sockaddr = ngx_slab_calloc_locked(pool, sizeof(ngx_sockaddr_t)); if (dst->sockaddr == NULL) { goto failed; } diff -r 4a670c18e5e6 -r 3b1b81e248bc src/stream/ngx_stream_upstream_zone_module.c --- a/src/stream/ngx_stream_upstream_zone_module.c Mon Sep 18 11:09:41 2017 +0300 +++ b/src/stream/ngx_stream_upstream_zone_module.c Fri Sep 22 13:10:49 2017 +0300 @@ -278,7 +278,7 @@ dst->server.data = NULL; } - dst->sockaddr = ngx_slab_calloc_locked(pool, NGX_SOCKADDRLEN); + dst->sockaddr = ngx_slab_calloc_locked(pool, sizeof(ngx_sockaddr_t)); if (dst->sockaddr == NULL) { goto failed; }