Mercurial > hg > nginx

changeset 3292:6ed04ab2d062

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow to inherit unix domain sockets while online upgrade
author Igor Sysoev <igor@sysoev.ru>
date Wed, 04 Nov 2009 18:36:43 +0000
parents 78faaf5cea44
children 8abb88374c6c
files src/core/ngx_connection.c
diffstat 1 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -117,11 +117,20 @@ ngx_set_inherited_sockets(ngx_cycle_t *c
 #if (NGX_HAVE_INET6)
         case AF_INET6:
              ls[i].addr_text_max_len = NGX_INET6_ADDRSTRLEN;
+             len = NGX_INET6_ADDRSTRLEN + sizeof(":65535") - 1;
+             break;
+#endif
+
+#if (NGX_HAVE_UNIX_DOMAIN)
+        case AF_UNIX:
+             ls[i].addr_text_max_len = NGX_UNIX_ADDRSTRLEN;
+             len = NGX_UNIX_ADDRSTRLEN;
              break;
 #endif
 
         case AF_INET:
              ls[i].addr_text_max_len = NGX_INET_ADDRSTRLEN;
+             len = NGX_INET_ADDRSTRLEN + sizeof(":65535") - 1;
              break;
 
         default:
@@ -132,8 +141,6 @@ ngx_set_inherited_sockets(ngx_cycle_t *c
             continue;
         }
 
-        len = ls[i].addr_text_max_len + sizeof(":65535") - 1;
-
         ls[i].addr_text.data = ngx_pnalloc(cycle->pool, len);
         if (ls[i].addr_text.data == NULL) {
             return NGX_ERROR;