From dcec6574b8b4ee118bdffbbbf6bf5a555853cb64 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Sun, 10 Feb 2013 02:56:03 +0000 Subject: Merge of r4945, r4984: ngx_inet.[ch] minor fixes. *) Fixed the NGX_SOCKADDR_STRLEN macro definition. The ngx_sock_ntop() function, when told to print both address and port, prints IPv6 address in square brackets, followed by colon and port. *) Properly initialize "struct in6_addr" with zeroes. --- src/core/ngx_inet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/ngx_inet.h') diff --git a/src/core/ngx_inet.h b/src/core/ngx_inet.h index c5a3d7677..e30dcb511 100644 --- a/src/core/ngx_inet.h +++ b/src/core/ngx_inet.h @@ -30,7 +30,7 @@ #if (NGX_HAVE_UNIX_DOMAIN) #define NGX_SOCKADDR_STRLEN (sizeof("unix:") - 1 + NGX_UNIX_ADDRSTRLEN) #else -#define NGX_SOCKADDR_STRLEN (NGX_INET6_ADDRSTRLEN + sizeof(":65535") - 1) +#define NGX_SOCKADDR_STRLEN (NGX_INET6_ADDRSTRLEN + sizeof("[]:65535") - 1) #endif #if (NGX_HAVE_UNIX_DOMAIN) -- cgit