mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-29 18:50:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix IPv6 and Unix domain sockets inheritance while online upgrade

Browse Source
This commit is contained in:
Igor Sysoev 2010-05-31 14:49:11 +00:00
parent 11f4ad3ec2
commit 23f904ea06
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/ngx_connection.c
View File

@ -96,14 +96,12 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle)
ls = cycle->listening.elts; ls = cycle->listening.elts;
for (i = 0; i < cycle->listening.nelts; i++) { for (i = 0; i < cycle->listening.nelts; i++) {
/* AF_INET only */ ls[i].sockaddr = ngx_palloc(cycle->pool, NGX_SOCKADDRLEN);
ls[i].sockaddr = ngx_palloc(cycle->pool, sizeof(struct sockaddr_in));
if (ls[i].sockaddr == NULL) { if (ls[i].sockaddr == NULL) {
return NGX_ERROR; 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) { if (getsockname(ls[i].fd, ls[i].sockaddr, &ls[i].socklen) == -1) {
ngx_log_error(NGX_LOG_CRIT, cycle->log, ngx_socket_errno, ngx_log_error(NGX_LOG_CRIT, cycle->log, ngx_socket_errno,
"getsockname() of the inherited " "getsockname() of the inherited "