summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2013-03-27 15:16:45 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2013-03-27 15:16:45 +0000
commit3b9e7adcf44d3970944913fb1e3f0b4f3979f3a9 (patch)
treec141e6c5e5d7bfb48deb0d8059622e88cf4d0f1e /src
parentc2bb76515beaa0fb531c1aa959834f6f876b89f9 (diff)
downloadnginx-3b9e7adcf44d3970944913fb1e3f0b4f3979f3a9.tar.gz
nginx-3b9e7adcf44d3970944913fb1e3f0b4f3979f3a9.tar.bz2
Event connect: don't penalize AF_INET6 connections.
Problems with setsockopt(TCP_NODELAY) and setsockopt(TCP_NOPUSH), as well as sendfile() syscall on Solaris, are specific to UNIX-domain sockets. Other address families, i.e. AF_INET and AF_INET6, are fine.
Diffstat (limited to 'src')
-rw-r--r--src/event/ngx_event_connect.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/event/ngx_event_connect.c b/src/event/ngx_event_connect.c
index 978f39b42..e6ae6564e 100644
--- a/src/event/ngx_event_connect.c
+++ b/src/event/ngx_event_connect.c
@@ -84,7 +84,7 @@ ngx_event_connect_peer(ngx_peer_connection_t *pc)
c->log_error = pc->log_error;
- if (pc->sockaddr->sa_family != AF_INET) {
+ if (pc->sockaddr->sa_family == AF_UNIX) {
c->tcp_nopush = NGX_TCP_NOPUSH_DISABLED;
c->tcp_nodelay = NGX_TCP_NODELAY_DISABLED;