diff options
| author | Sergey Kandaurov <pluknet@nginx.com> | 2021-03-10 15:39:01 +0300 |
|---|---|---|
| committer | Sergey Kandaurov <pluknet@nginx.com> | 2021-03-10 15:39:01 +0300 |
| commit | 02b52e4c0b71b960ce426ef80fefa359e5e6b42e (patch) | |
| tree | eb36f3f05641ada335fc88ff4f04d6e75555010c /auto | |
| parent | b7433b15fcdd97cc0d8b45407a4af1520663e54f (diff) | |
| parent | 0026dded46da04b6b4522c5887bed5fceb4eda11 (diff) | |
| download | nginx-02b52e4c0b71b960ce426ef80fefa359e5e6b42e.tar.gz nginx-02b52e4c0b71b960ce426ef80fefa359e5e6b42e.tar.bz2 | |
Merged with the default branch.
Diffstat (limited to 'auto')
| -rw-r--r-- | auto/init | 2 | ||||
| -rw-r--r-- | auto/install | 2 | ||||
| -rw-r--r-- | auto/modules | 6 | ||||
| -rw-r--r-- | auto/unix | 40 |
4 files changed, 24 insertions, 26 deletions
@@ -48,4 +48,6 @@ default: build clean: rm -rf Makefile $NGX_OBJS + +.PHONY: default clean END diff --git a/auto/install b/auto/install index d884487a1..c764fdd2f 100644 --- a/auto/install +++ b/auto/install @@ -215,4 +215,6 @@ upgrade: test -f $NGX_PID_PATH.oldbin kill -QUIT \`cat $NGX_PID_PATH.oldbin\` + +.PHONY: build install modules upgrade END diff --git a/auto/modules b/auto/modules index b3a697e71..5b0c2d689 100644 --- a/auto/modules +++ b/auto/modules @@ -1037,6 +1037,12 @@ if [ $MAIL != NO ]; then ngx_module_srcs=src/mail/ngx_mail_proxy_module.c . auto/module + + ngx_module_name=ngx_mail_realip_module + ngx_module_deps= + ngx_module_srcs=src/mail/ngx_mail_realip_module.c + + . auto/module fi @@ -727,56 +727,44 @@ ngx_feature_test="char buf[1]; struct iovec vec[1]; ssize_t n; . auto/feature -ngx_feature="sys_nerr" -ngx_feature_name="NGX_SYS_NERR" -ngx_feature_run=value -ngx_feature_incs='#include <errno.h> - #include <stdio.h>' +# strerrordesc_np(), introduced in glibc 2.32 + +ngx_feature="strerrordesc_np()" +ngx_feature_name="NGX_HAVE_STRERRORDESC_NP" +ngx_feature_run=no +ngx_feature_incs='#include <string.h>' ngx_feature_path= ngx_feature_libs= -ngx_feature_test='printf("%d", sys_nerr);' +ngx_feature_test="char *p; p = strerrordesc_np(0); + if (p == NULL) return 1" . auto/feature if [ $ngx_found = no ]; then - # Cygiwn defines _sys_nerr - ngx_feature="_sys_nerr" + ngx_feature="sys_nerr" ngx_feature_name="NGX_SYS_NERR" ngx_feature_run=value ngx_feature_incs='#include <errno.h> #include <stdio.h>' ngx_feature_path= ngx_feature_libs= - ngx_feature_test='printf("%d", _sys_nerr);' + ngx_feature_test='printf("%d", sys_nerr);' . auto/feature fi if [ $ngx_found = no ]; then - # Solaris has no sys_nerr - ngx_feature='maximum errno' - ngx_feature_name=NGX_SYS_NERR + # Cygiwn defines _sys_nerr + ngx_feature="_sys_nerr" + ngx_feature_name="NGX_SYS_NERR" ngx_feature_run=value ngx_feature_incs='#include <errno.h> - #include <string.h> #include <stdio.h>' ngx_feature_path= ngx_feature_libs= - ngx_feature_test='int n; - char *p; - for (n = 1; n < 1000; n++) { - errno = 0; - p = strerror(n); - if (errno == EINVAL - || p == NULL - || strncmp(p, "Unknown error", 13) == 0) - { - break; - } - } - printf("%d", n);' + ngx_feature_test='printf("%d", _sys_nerr);' . auto/feature fi |