diff options
Diffstat (limited to 'src/core/ngx_connection.c')
| -rw-r--r-- | src/core/ngx_connection.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index 827477501..226dc1ec8 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -49,7 +49,6 @@ ngx_listening_inet_stream_socket(ngx_conf_t *cf, in_addr_t addr, in_port_t port) - ls->addr_text.data; ls->fd = (ngx_socket_t) -1; - ls->family = AF_INET; ls->type = SOCK_STREAM; ls->sockaddr = (struct sockaddr *) sin; ls->socklen = sizeof(struct sockaddr_in); @@ -113,9 +112,8 @@ ngx_set_inherited_sockets(ngx_cycle_t *cycle) return NGX_ERROR; } - ls[i].family = sin->sin_family; - len = ngx_sock_ntop(ls[i].family, ls[i].sockaddr, - ls[i].addr_text.data, NGX_INET_ADDRSTRLEN); + len = ngx_sock_ntop(ls[i].sockaddr, ls[i].addr_text.data, + NGX_INET_ADDRSTRLEN); if (len == 0) { return NGX_ERROR; } @@ -255,7 +253,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle) continue; } - s = ngx_socket(ls[i].family, ls[i].type, 0); + s = ngx_socket(ls[i].sockaddr->sa_family, ls[i].type, 0); if (s == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_socket_errno, |