diff options
| author | Andrei Belov <defan@nginx.com> | 2021-11-18 17:04:04 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2021-11-18 17:04:04 +0300 |
| commit | b400ccd1aa8eeb6a5de1707e0bb8c3d417fe69b7 (patch) | |
| tree | 60ff49ffc16ef7cb3aad1beb2d78f051a8794cdf /auto | |
| parent | fafd44166d9e835e91a4c5668048308ce99a62bd (diff) | |
| parent | b77895d1c7d6cd4826ac7427c91baa95b998a912 (diff) | |
| download | unit-b400ccd1aa8eeb6a5de1707e0bb8c3d417fe69b7.tar.gz unit-b400ccd1aa8eeb6a5de1707e0bb8c3d417fe69b7.tar.bz2 | |
Merged with the default branch.1.26.0-1
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/make | 1 | ||||
| -rw-r--r-- | auto/sockets | 52 | ||||
| -rw-r--r-- | auto/sources | 2 |
3 files changed, 55 insertions, 0 deletions
@@ -59,6 +59,7 @@ $echo >> $NXT_MAKEFILE $echo "NXT_LIB_UNIT_OBJS = \\" >> $NXT_MAKEFILE $echo " $NXT_BUILD_DIR/src/nxt_lvlhsh.o \\" >> $NXT_MAKEFILE $echo " $NXT_BUILD_DIR/src/nxt_murmur_hash.o \\" >> $NXT_MAKEFILE +$echo " $NXT_BUILD_DIR/src/nxt_socket_msg.o \\" >> $NXT_MAKEFILE $echo " $NXT_BUILD_DIR/src/nxt_websocket.o \\" >> $NXT_MAKEFILE for nxt_src in $NXT_LIB_UNIT_SRCS diff --git a/auto/sockets b/auto/sockets index c8d1173e..1b6b4368 100644 --- a/auto/sockets +++ b/auto/sockets @@ -158,6 +158,58 @@ nxt_feature_test="#include <stdio.h> }" . auto/feature +if [ $nxt_found = no ]; then + $echo + $echo $0: error: no msghdr.msg_control struct member. + $echo + exit 1; +fi + + +nxt_feature="sockopt SO_PASSCRED" +nxt_feature_name=NXT_HAVE_SOCKOPT_SO_PASSCRED +nxt_feature_run= +nxt_feature_incs= +nxt_feature_libs= +nxt_feature_test="#define _GNU_SOURCE + #include <sys/socket.h> + + int main() { + return SO_PASSCRED == 0; + }" +. auto/feature + + +if [ $nxt_found = yes ]; then + nxt_feature="struct ucred" + nxt_feature_name=NXT_HAVE_UCRED + nxt_feature_run= + nxt_feature_incs= + nxt_feature_libs= + nxt_feature_test="#define _GNU_SOURCE + #include <sys/socket.h> + #include <sys/un.h> + + int main() { + return sizeof(struct ucred); + }" + . auto/feature +fi + + +nxt_feature="struct cmsgcred" +nxt_feature_name=NXT_HAVE_MSGHDR_CMSGCRED +nxt_feature_run= +nxt_feature_incs= +nxt_feature_libs= +nxt_feature_test="#define _GNU_SOURCE + #include <sys/socket.h> + + int main() { + return sizeof(struct cmsgcred); + }" +. auto/feature + nxt_feature="sys/filio.h" nxt_feature_name=NXT_HAVE_SYS_FILIO_H diff --git a/auto/sources b/auto/sources index 01fec6c1..27a45edc 100644 --- a/auto/sources +++ b/auto/sources @@ -13,6 +13,7 @@ NXT_LIB_SRCS=" \ src/nxt_mem_map.c \ src/nxt_socket.c \ src/nxt_socketpair.c \ + src/nxt_socket_msg.c \ src/nxt_credential.c \ src/nxt_isolation.c \ src/nxt_process.c \ @@ -170,6 +171,7 @@ NXT_TEST_SRCS=" \ src/test/nxt_rbtree1_test.c \ src/test/nxt_http_parse_test.c \ src/test/nxt_strverscmp_test.c \ + src/test/nxt_base64_test.c \ " |