]> git.kaiwu.me - nginx.git/commitdiff
allow to inherit unix domain sockets while online upgrade
authorIgor Sysoev <igor@sysoev.ru>
Wed, 4 Nov 2009 18:36:43 +0000 (18:36 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Wed, 4 Nov 2009 18:36:43 +0000 (18:36 +0000)
src/core/ngx_connection.c

index 9d064c5ace00696bc2187a6d8d887199368a40c6..3bd9cc6762207bfa5c10c3fe8d2f1ab86ece1749 100644 (file)
@@ -117,11 +117,20 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
 #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 *cycle)
             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;