summaryrefslogtreecommitdiffhomepage
path: root/src/event/ngx_event_accept.c
diff options
context:
space:
mode:
authorVladimir Homutov <vl@nginx.com>2013-07-11 16:07:25 +0400
committerVladimir Homutov <vl@nginx.com>2013-07-11 16:07:25 +0400
commitaf18946d769296d9efead825a0d1aa6a1a41fe74 (patch)
tree6b34cebcacea394e0126bcff647a3e73ab25c36d /src/event/ngx_event_accept.c
parent050f74b751c10eeb2491ec6509d0508a7e690209 (diff)
downloadnginx-af18946d769296d9efead825a0d1aa6a1a41fe74.tar.gz
nginx-af18946d769296d9efead825a0d1aa6a1a41fe74.tar.bz2
Core: extended ngx_sock_ntop() with socklen parameter.
On Linux, sockaddr length is required to process unix socket addresses properly due to unnamed sockets (which don't have sun_path set at all) and abstract namespace sockets.
Diffstat (limited to 'src/event/ngx_event_accept.c')
-rw-r--r--src/event/ngx_event_accept.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/event/ngx_event_accept.c b/src/event/ngx_event_accept.c
index 6087d60da..e3f828da8 100644
--- a/src/event/ngx_event_accept.c
+++ b/src/event/ngx_event_accept.c
@@ -275,7 +275,8 @@ ngx_event_accept(ngx_event_t *ev)
return;
}
- c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->addr_text.data,
+ c->addr_text.len = ngx_sock_ntop(c->sockaddr, c->socklen,
+ c->addr_text.data,
ls->addr_text_max_len, 0);
if (c->addr_text.len == 0) {
ngx_close_accepted_connection(c);