[nginx] svn commit: r5038 - in branches/stable-1.2: . src/core

[mdounin at mdounin.ru]

Author: mdounin
Date: 2013-02-10 02:56:03 +0000 (Sun, 10 Feb 2013)
New Revision: 5038
URL: http://trac.nginx.org/nginx/changeset/5038/nginx

Log:
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.


Modified:
   branches/stable-1.2/
   branches/stable-1.2/src/core/ngx_inet.c
   branches/stable-1.2/src/core/ngx_inet.h

Index: branches/stable-1.2
===================================================================
--- branches/stable-1.2	2013-02-09 21:27:37 UTC (rev 5037)
+++ branches/stable-1.2	2013-02-10 02:56:03 UTC (rev 5038)

Property changes on: branches/stable-1.2
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944
+/trunk:4611-4632,4636-4657,4671-4672,4674-4676,4682,4684-4699,4704-4706,4713,4736-4741,4754,4756-4771,4775,4777-4780,4782-4785,4795,4811-4820,4822-4824,4828-4835,4840-4844,4865-4872,4885-4887,4890-4896,4913-4925,4933-4934,4939,4944-4945,4984
\ No newline at end of property
Modified: branches/stable-1.2/src/core/ngx_inet.c
===================================================================
--- branches/stable-1.2/src/core/ngx_inet.c	2013-02-09 21:27:37 UTC (rev 5037)
+++ branches/stable-1.2/src/core/ngx_inet.c	2013-02-10 02:56:03 UTC (rev 5038)
@@ -465,7 +465,7 @@
      * prevent MSVC8 warning:
      *    potentially uninitialized local variable 'inaddr6' used
      */
-    ngx_memzero(inaddr6.s6_addr, sizeof(struct in6_addr));
+    ngx_memzero(&inaddr6, sizeof(struct in6_addr));
 #endif
 
     inaddr = ngx_inet_addr(text, len);

Modified: branches/stable-1.2/src/core/ngx_inet.h
===================================================================
--- branches/stable-1.2/src/core/ngx_inet.h	2013-02-09 21:27:37 UTC (rev 5037)
+++ branches/stable-1.2/src/core/ngx_inet.h	2013-02-10 02:56:03 UTC (rev 5038)
@@ -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)