diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-05-31 14:49:11 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-05-31 14:49:11 +0000 |
| commit | 23f904ea0677ed15eaf1620be72918f583b64ca2 (patch) | |
| tree | 5e092f1ad1706b77d7f2fecd195e45c59038113a /src/core/ngx_connection.c | |
| parent | 11f4ad3ec215b1f5aba16f8240316fff70de1f88 (diff) | |
| download | nginx-23f904ea0677ed15eaf1620be72918f583b64ca2.tar.gz nginx-23f904ea0677ed15eaf1620be72918f583b64ca2.zip | |
fix IPv6 and Unix domain sockets inheritance while online upgrade
Diffstat (limited to 'src/core/ngx_connection.c')
| -rw-r--r-- | src/core/ngx_connection.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index 1f6a19520..4a90b6120 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -96,14 +96,12 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle) ls = cycle->listening.elts; for (i = 0; i < cycle->listening.nelts; i++) { - /* AF_INET only */ - - ls[i].sockaddr = ngx_palloc(cycle->pool, sizeof(struct sockaddr_in)); + ls[i].sockaddr = ngx_palloc(cycle->pool, NGX_SOCKADDRLEN); if (ls[i].sockaddr == NULL) { return NGX_ERROR; } - ls[i].socklen = sizeof(struct sockaddr_in); + ls[i].socklen = NGX_SOCKADDRLEN; if (getsockname(ls[i].fd, ls[i].sockaddr, &ls[i].socklen) == -1) { ngx_log_error(NGX_LOG_CRIT, cycle->log, ngx_socket_errno, "getsockname() of the inherited " |