summaryrefslogtreecommitdiff
path: root/auto
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2017-12-07 17:09:33 +0300
committerMaxim Dounin <mdounin@mdounin.ru>2017-12-07 17:09:33 +0300
commit6ff1340262fbb13f1b9c71a92b647f0e05555d11 (patch)
treefdf2d7b8694a60698f4b4f4c3ed1ea715b6bdb36 /auto
parent6754a404669b527340dd74270289da6adfc6302f (diff)
downloadnginx-6ff1340262fbb13f1b9c71a92b647f0e05555d11.tar.gz
Configure: moved IP_BIND_ADDRESS_NO_PORT test.
In 2c7b488a61fb, IP_BIND_ADDRESS_NO_PORT test was accidentally placed between SO_BINDANY, IP_TRANSPARENT, and IP_BINDANY tests. Moved it after these tests.
Diffstat (limited to 'auto')
-rw-r--r--auto/unix22
1 files changed, 11 insertions, 11 deletions
diff --git a/auto/unix b/auto/unix
index 10835f6cc..77ea02986 100644
--- a/auto/unix
+++ b/auto/unix
@@ -354,42 +354,42 @@ ngx_feature_test="setsockopt(0, SOL_SOCKET, SO_BINDANY, NULL, 0)"
. auto/feature
-# Linux IP_BIND_ADDRESS_NO_PORT
+# Linux transparent proxying
-ngx_feature="IP_BIND_ADDRESS_NO_PORT"
-ngx_feature_name="NGX_HAVE_IP_BIND_ADDRESS_NO_PORT"
+ngx_feature="IP_TRANSPARENT"
+ngx_feature_name="NGX_HAVE_TRANSPARENT_PROXY"
ngx_feature_run=no
ngx_feature_incs="#include <sys/socket.h>
#include <netinet/in.h>"
ngx_feature_path=
ngx_feature_libs=
-ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_BIND_ADDRESS_NO_PORT, NULL, 0)"
+ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_TRANSPARENT, NULL, 0)"
. auto/feature
-# Linux transparent proxying
+# FreeBSD bind to any address for transparent proxying
-ngx_feature="IP_TRANSPARENT"
+ngx_feature="IP_BINDANY"
ngx_feature_name="NGX_HAVE_TRANSPARENT_PROXY"
ngx_feature_run=no
ngx_feature_incs="#include <sys/socket.h>
#include <netinet/in.h>"
ngx_feature_path=
ngx_feature_libs=
-ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_TRANSPARENT, NULL, 0)"
+ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_BINDANY, NULL, 0)"
. auto/feature
-# FreeBSD bind to any address for transparent proxying
+# Linux IP_BIND_ADDRESS_NO_PORT
-ngx_feature="IP_BINDANY"
-ngx_feature_name="NGX_HAVE_TRANSPARENT_PROXY"
+ngx_feature="IP_BIND_ADDRESS_NO_PORT"
+ngx_feature_name="NGX_HAVE_IP_BIND_ADDRESS_NO_PORT"
ngx_feature_run=no
ngx_feature_incs="#include <sys/socket.h>
#include <netinet/in.h>"
ngx_feature_path=
ngx_feature_libs=
-ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_BINDANY, NULL, 0)"
+ngx_feature_test="setsockopt(0, IPPROTO_IP, IP_BIND_ADDRESS_NO_PORT, NULL, 0)"
. auto/feature