Nginx/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-11-21 16:28:40 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Move SO_ACCEPTFILTER and TCP_DEFER_ACCEPT checks into configure.

Browse Source 
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).
This commit is contained in:
Maxim Dounin 2011-08-21 11:37:37 +00:00
parent 5a52d67a08
commit ec8186c733
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
auto/unix
View File

@ -295,6 +295,7 @@ if [ $ngx_found != yes ]; then
fi fi
fi fi
ngx_feature="SO_SETFIB" ngx_feature="SO_SETFIB"
ngx_feature_name="NGX_HAVE_SETFIB" ngx_feature_name="NGX_HAVE_SETFIB"
ngx_feature_run=no ngx_feature_run=no
@ -305,6 +306,28 @@ ngx_feature_test="setsockopt(0, SOL_SOCKET, SO_SETFIB, NULL, 4)"
. auto/feature . auto/feature
ngx_feature="SO_ACCEPTFILTER"
ngx_feature_name="NGX_HAVE_DEFERRED_ACCEPT"
ngx_feature_run=no
ngx_feature_incs="#include <sys/socket.h>"
ngx_feature_path=
ngx_feature_libs=
ngx_feature_test="setsockopt(0, SOL_SOCKET, SO_ACCEPTFILTER, NULL, 0)"
. auto/feature
ngx_feature="TCP_DEFER_ACCEPT"
ngx_feature_name="NGX_HAVE_DEFERRED_ACCEPT"
ngx_feature_run=no
ngx_feature_incs="#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>"
ngx_feature_path=
ngx_feature_libs=
ngx_feature_test="setsockopt(0, IPPROTO_TCP, TCP_DEFER_ACCEPT, NULL, 0)"
. auto/feature
ngx_feature="accept4()" ngx_feature="accept4()"
ngx_feature_name="NGX_HAVE_ACCEPT4" ngx_feature_name="NGX_HAVE_ACCEPT4"
ngx_feature_run=no ngx_feature_run=no

2
src/core/ngx_connection.c
View File

@ -580,7 +580,7 @@ ngx_configure_listening_sockets(ngx_cycle_t *cycle)
{ {
ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno,
"setsockopt(SO_ACCEPTFILTER, \"%s\") " "setsockopt(SO_ACCEPTFILTER, \"%s\") "
" for %V failed, ignored", "for %V failed, ignored",
ls[i].accept_filter, &ls[i].addr_text); ls[i].accept_filter, &ls[i].addr_text);
continue; continue;
} }

5
src/os/unix/ngx_freebsd_config.h
View File

@ -92,11 +92,6 @@ typedef struct aiocb ngx_aiocb_t;
#define NGX_LISTEN_BACKLOG -1 #define NGX_LISTEN_BACKLOG -1
#if (defined SO_ACCEPTFILTER && !defined NGX_HAVE_DEFERRED_ACCEPT)
#define NGX_HAVE_DEFERRED_ACCEPT 1
#endif
#if (__FreeBSD_version < 430000 || __FreeBSD_version < 500012) #if (__FreeBSD_version < 430000 || __FreeBSD_version < 500012)
pid_t rfork_thread(int flags, void *stack, int (*func)(void *arg), void *arg); pid_t rfork_thread(int flags, void *stack, int (*func)(void *arg), void *arg);

5
src/os/unix/ngx_linux_config.h
View File

@ -96,11 +96,6 @@ typedef struct iocb ngx_aiocb_t;
#define NGX_LISTEN_BACKLOG 511 #define NGX_LISTEN_BACKLOG 511
#if defined TCP_DEFER_ACCEPT && !defined NGX_HAVE_DEFERRED_ACCEPT
#define NGX_HAVE_DEFERRED_ACCEPT 1
#endif
#ifndef NGX_HAVE_SO_SNDLOWAT #ifndef NGX_HAVE_SO_SNDLOWAT
/* setsockopt(SO_SNDLOWAT) returns ENOPROTOOPT */ /* setsockopt(SO_SNDLOWAT) returns ENOPROTOOPT */
#define NGX_HAVE_SO_SNDLOWAT 0 #define NGX_HAVE_SO_SNDLOWAT 0