diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-12-18 16:02:44 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-12-18 16:02:44 +0000 |
| commit | 43f279dc9c57673ffdf6058590ee16f798fb0b24 (patch) | |
| tree | 70f1073e0a266f1888469712709df3817dc2df1b /auto/os/linux | |
| parent | d10f2fb86f787f8e5bffd5877f2a0cf72afb1d55 (diff) | |
| download | nginx-release-0.3.17.tar.gz nginx-release-0.3.17.zip | |
nginx-0.3.17-RELEASE importrelease-0.3.17
*) Change: now on Linux configure checks the presence of epoll and
sendfile64() in kernel.
*) Feature: the "map" directive supports domain names in the
".domain.tld" form.
*) Bugfix: the timeouts were not used in SSL handshake; the bug had
appeared in 0.2.4.
*) Bugfix: in the HTTPS protocol in the "proxy_pass" directive.
*) Bugfix: when the HTTPS protocol was used in the "proxy_pass"
directive the port 80 was used by default.
Diffstat (limited to 'auto/os/linux')
| -rw-r--r-- | auto/os/linux | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/auto/os/linux b/auto/os/linux index 39027b370..a7a8d713d 100644 --- a/auto/os/linux +++ b/auto/os/linux @@ -38,7 +38,7 @@ fi ngx_feature="epoll" ngx_feature_name="NGX_HAVE_EPOLL" -ngx_feature_run=no +ngx_feature_run=yes ngx_feature_incs="#include <sys/epoll.h>" ngx_feature_libs= ngx_feature_test="int efd = 0, fd = 1, n; @@ -62,12 +62,14 @@ fi CC_AUX_FLAGS="-D_GNU_SOURCE" ngx_feature="sendfile()" ngx_feature_name="NGX_HAVE_SENDFILE" -ngx_feature_run=no -ngx_feature_incs="#include <sys/sendfile.h>" +ngx_feature_run=yes +ngx_feature_incs="#include <sys/sendfile.h> +#include <errno.h>" ngx_feature_libs= ngx_feature_test="int s = 0, fd = 1; ssize_t n; off_t off = 0; - n = sendfile(s, fd, &off, 1)" + n = sendfile(s, fd, &off, 1); + if (n == -1 && errno == ENOSYS) return 1" . auto/feature if [ $ngx_found = yes ]; then @@ -80,12 +82,14 @@ fi CC_AUX_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" ngx_feature="sendfile64()" ngx_feature_name="NGX_HAVE_SENDFILE64" -ngx_feature_run=no -ngx_feature_incs="#include <sys/sendfile.h>" +ngx_feature_run=yes +ngx_feature_incs="#include <sys/sendfile.h> +#include <errno.h>" ngx_feature_libs= ngx_feature_test="int s = 0, fd = 1; ssize_t n; off_t off = 0; - n = sendfile(s, fd, &off, 1)" + n = sendfile(s, fd, &off, 1); + if (n == -1 && errno == ENOSYS) return 1" . auto/feature |