diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 11:25:15 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 11:25:15 +0000 |
| commit | 8b85d78ecd81d005c542cd5da6d19f78257af2b2 (patch) | |
| tree | cb80f8003965d1ebfae253231381fef04a94dca2 /src/core | |
| parent | 1b6bed1c8e0652e133155c323a3fdd56f3fb31c3 (diff) | |
| download | nginx-8b85d78ecd81d005c542cd5da6d19f78257af2b2.tar.gz nginx-8b85d78ecd81d005c542cd5da6d19f78257af2b2.tar.bz2 | |
Merging r4017:
Move SO_ACCEPTFILTER and TCP_DEFER_ACCEPT checks into configure.
NetBSD 5.0+ has SO_ACCEPTFILTER support merged from FreeBSD, and having
accept filter check in FreeBSD-specific ngx_freebsd_config.h prevents it
from being used on NetBSD. Therefore move the check into configure (and
do the same for Linux-specific TCP_DEFER_ACCEPT, just to be in line).
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ngx_connection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index 9f19fcc4f..3674b9a74 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -580,7 +580,7 @@ ngx_configure_listening_sockets(ngx_cycle_t *cycle) { ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, "setsockopt(SO_ACCEPTFILTER, \"%s\") " - " for %V failed, ignored", + "for %V failed, ignored", ls[i].accept_filter, &ls[i].addr_text); continue; } |