Mercurial > hg > nginx
diff src/event/ngx_event_acceptex.c @ 2198:5975975eedc0
ngx_sock_ntop() takes family from sockaddr, remove duplicate field
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 21 Aug 2008 19:24:07 +0000 |
parents | 2a92804f4109 |
children | 2e91aecb9e57 |
line wrap: on
line diff
--- a/src/event/ngx_event_acceptex.c +++ b/src/event/ngx_event_acceptex.c @@ -65,8 +65,7 @@ ngx_event_acceptex(ngx_event_t *rev) return; } - c->addr_text.len = ngx_sock_ntop(c->listening->family, c->sockaddr, - c->addr_text.data, + c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->addr_text.data, c->listening->addr_text_max_len); if (c->addr_text.len == 0) { /* TODO: close socket */ @@ -100,7 +99,7 @@ ngx_event_post_acceptex(ngx_listening_t /* TODO: look up reused sockets */ - s = ngx_socket(ls->family, ls->type, 0); + s = ngx_socket(ls->sockaddr->sa_family, ls->type, 0); ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &ls->log, 0, ngx_socket_n " s:%d", s);