summaryrefslogtreecommitdiff
path: root/auto
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2010-12-13 11:06:01 +0000
committerJonathan Kolb <jon@b0g.us>2010-12-13 11:06:01 +0000
commit487d8fc7628cac7beb9240e6f1d9ebf53a1f30d7 (patch)
tree7daf46ec00cf8ef94572d39bcdcb40f9e16ea66b /auto
parent12368999b3ed45cde5e4cea8ea985d4444dcd932 (diff)
downloadnginx-487d8fc7628cac7beb9240e6f1d9ebf53a1f30d7.tar.gz
Changes with nginx 0.9.3 13 Dec 2010v0.9.3
*) Bugfix: if there was a single server for given IPv6 address:port pair, then captures in regular expressions in a "server_name" directive did not work. *) Bugfix: nginx could not be built on Solaris; the bug had appeared in 0.9.0.
Diffstat (limited to 'auto')
-rwxr-xr-xauto/unix46
1 files changed, 36 insertions, 10 deletions
diff --git a/auto/unix b/auto/unix
index 5818180d6..ee284e1d1 100755
--- a/auto/unix
+++ b/auto/unix
@@ -119,16 +119,42 @@ ngx_feature_test='printf("%d", sys_nerr);'
. auto/feature
-# 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 <stdio.h>'
-ngx_feature_path=
-ngx_feature_libs=
-ngx_feature_test='printf("%d", _sys_nerr);'
-. auto/feature
+if [ $ngx_found = no ]; then
+
+ # 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 <stdio.h>'
+ ngx_feature_path=
+ ngx_feature_libs=
+ 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
+ ngx_feature_run=value
+ ngx_feature_incs='#include <errno.h>
+ #include <stdio.h>'
+ ngx_feature_path=
+ ngx_feature_libs=
+ ngx_feature_test='int n;
+ for (n = 1; n < 1000; n++) {
+ errno = 0;
+ strerror(n);
+ if (errno == EINVAL) {
+ printf("%d", n);
+ return 0;
+ }
+ }'
+ . auto/feature
+fi
ngx_feature="localtime_r()"