Mercurial > hg > nginx

comparison auto/unix @ 4243:997651ba1871 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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).
author Igor Sysoev <igor@sysoev.ru>
date Tue, 01 Nov 2011 11:25:15 +0000
parents 0ea785433fcf
children 52c881519427
comparison
equal deleted inserted replaced
4242:025396b57ec1 4243:997651ba1871
293 if [ $ngx_found = yes ]; then 293 if [ $ngx_found = yes ]; then
294 CORE_LIBS="$CORE_LIBS -lrt" 294 CORE_LIBS="$CORE_LIBS -lrt"
295 fi 295 fi
296 fi 296 fi
297 297
298
298 ngx_feature="SO_SETFIB" 299 ngx_feature="SO_SETFIB"
299 ngx_feature_name="NGX_HAVE_SETFIB" 300 ngx_feature_name="NGX_HAVE_SETFIB"
300 ngx_feature_run=no 301 ngx_feature_run=no
301 ngx_feature_incs="#include <sys/socket.h>" 302 ngx_feature_incs="#include <sys/socket.h>"
302 ngx_feature_path= 303 ngx_feature_path=
303 ngx_feature_libs= 304 ngx_feature_libs=
304 ngx_feature_test="setsockopt(0, SOL_SOCKET, SO_SETFIB, NULL, 4)" 305 ngx_feature_test="setsockopt(0, SOL_SOCKET, SO_SETFIB, NULL, 4)"
306 . auto/feature
307
308
309 ngx_feature="SO_ACCEPTFILTER"
310 ngx_feature_name="NGX_HAVE_DEFERRED_ACCEPT"
311 ngx_feature_run=no
312 ngx_feature_incs="#include <sys/socket.h>"
313 ngx_feature_path=
314 ngx_feature_libs=
315 ngx_feature_test="setsockopt(0, SOL_SOCKET, SO_ACCEPTFILTER, NULL, 0)"
316 . auto/feature
317
318
319 ngx_feature="TCP_DEFER_ACCEPT"
320 ngx_feature_name="NGX_HAVE_DEFERRED_ACCEPT"
321 ngx_feature_run=no
322 ngx_feature_incs="#include <sys/socket.h>
323 #include <netinet/in.h>
324 #include <netinet/tcp.h>"
325 ngx_feature_path=
326 ngx_feature_libs=
327 ngx_feature_test="setsockopt(0, IPPROTO_TCP, TCP_DEFER_ACCEPT, NULL, 0)"
305 . auto/feature 328 . auto/feature
306 329
307 330
308 ngx_feature="accept4()" 331 ngx_feature="accept4()"
309 ngx_feature_name="NGX_HAVE_ACCEPT4" 332 ngx_feature_name="NGX_HAVE_ACCEPT4"