diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-11-04 18:36:43 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-11-04 18:36:43 +0000 |
| commit | bcc44e25499d03b9d85b5fd5f07f8323934a75b8 (patch) | |
| tree | b34ad49173d4b39d953afd980d3997e9af83a00b /src | |
| parent | 7319b925918fe73aa1221a656ec3172ba2b11951 (diff) | |
| download | nginx-bcc44e25499d03b9d85b5fd5f07f8323934a75b8.tar.gz nginx-bcc44e25499d03b9d85b5fd5f07f8323934a75b8.zip | |
allow to inherit unix domain sockets while online upgrade
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ngx_connection.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index 9d064c5ac..3bd9cc676 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -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; |