comparison auto/os/linux @ 140:55a211e5eeb7 NGINX_0_3_17

nginx 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; bug 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.
author Igor Sysoev <http://sysoev.ru>
date Sun, 18 Dec 2005 00:00:00 +0300
parents 91372f004adf
children 87699398f955
comparison
equal deleted inserted replaced
139:9cee8bc94578 140:55a211e5eeb7
36 36
37 # epoll, EPOLLET version 37 # epoll, EPOLLET version
38 38
39 ngx_feature="epoll" 39 ngx_feature="epoll"
40 ngx_feature_name="NGX_HAVE_EPOLL" 40 ngx_feature_name="NGX_HAVE_EPOLL"
41 ngx_feature_run=no 41 ngx_feature_run=yes
42 ngx_feature_incs="#include <sys/epoll.h>" 42 ngx_feature_incs="#include <sys/epoll.h>"
43 ngx_feature_libs= 43 ngx_feature_libs=
44 ngx_feature_test="int efd = 0, fd = 1, n; 44 ngx_feature_test="int efd = 0, fd = 1, n;
45 struct epoll_event ee; 45 struct epoll_event ee;
46 ee.events = EPOLLIN|EPOLLOUT|EPOLLET; 46 ee.events = EPOLLIN|EPOLLOUT|EPOLLET;
60 # sendfile() 60 # sendfile()
61 61
62 CC_AUX_FLAGS="-D_GNU_SOURCE" 62 CC_AUX_FLAGS="-D_GNU_SOURCE"
63 ngx_feature="sendfile()" 63 ngx_feature="sendfile()"
64 ngx_feature_name="NGX_HAVE_SENDFILE" 64 ngx_feature_name="NGX_HAVE_SENDFILE"
65 ngx_feature_run=no 65 ngx_feature_run=yes
66 ngx_feature_incs="#include <sys/sendfile.h>" 66 ngx_feature_incs="#include <sys/sendfile.h>
67 #include <errno.h>"
67 ngx_feature_libs= 68 ngx_feature_libs=
68 ngx_feature_test="int s = 0, fd = 1; 69 ngx_feature_test="int s = 0, fd = 1;
69 ssize_t n; off_t off = 0; 70 ssize_t n; off_t off = 0;
70 n = sendfile(s, fd, &off, 1)" 71 n = sendfile(s, fd, &off, 1);
72 if (n == -1 && errno == ENOSYS) return 1"
71 . auto/feature 73 . auto/feature
72 74
73 if [ $ngx_found = yes ]; then 75 if [ $ngx_found = yes ]; then
74 CORE_SRCS="$CORE_SRCS $LINUX_SENDFILE_SRCS" 76 CORE_SRCS="$CORE_SRCS $LINUX_SENDFILE_SRCS"
75 fi 77 fi
78 # sendfile64() 80 # sendfile64()
79 81
80 CC_AUX_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" 82 CC_AUX_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
81 ngx_feature="sendfile64()" 83 ngx_feature="sendfile64()"
82 ngx_feature_name="NGX_HAVE_SENDFILE64" 84 ngx_feature_name="NGX_HAVE_SENDFILE64"
83 ngx_feature_run=no 85 ngx_feature_run=yes
84 ngx_feature_incs="#include <sys/sendfile.h>" 86 ngx_feature_incs="#include <sys/sendfile.h>
87 #include <errno.h>"
85 ngx_feature_libs= 88 ngx_feature_libs=
86 ngx_feature_test="int s = 0, fd = 1; 89 ngx_feature_test="int s = 0, fd = 1;
87 ssize_t n; off_t off = 0; 90 ssize_t n; off_t off = 0;
88 n = sendfile(s, fd, &off, 1)" 91 n = sendfile(s, fd, &off, 1);
92 if (n == -1 && errno == ENOSYS) return 1"
89 . auto/feature 93 . auto/feature
90 94
91 95
92 ngx_include="sys/prctl.h"; . auto/include 96 ngx_include="sys/prctl.h"; . auto/include
93 97