annotate auto/os/darwin @ 660:d0f7a625f27c NGINX_1_1_14

nginx 1.1.14 *) Feature: multiple "limit_req" limits may be used simultaneously. *) Bugfix: in error handling while connecting to a backend. Thanks to Piotr Sikora. *) Bugfix: in AIO error handling on FreeBSD. *) Bugfix: in the OpenSSL library initialization. *) Bugfix: the "proxy_redirect" directives might not be correctly inherited. *) Bugfix: memory leak during reconfiguration if the "pcre_jit" directive was used.
author Igor Sysoev <http://sysoev.ru>
date Mon, 30 Jan 2012 00:00:00 +0400
parents 0b6053502c55
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
390
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
1
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
2 # Copyright (C) Igor Sysoev
660
d0f7a625f27c nginx 1.1.14
Igor Sysoev <http://sysoev.ru>
parents: 390
diff changeset
3 # Copyright (C) Nginx, Inc.
390
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
4
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
5
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
6 have=NGX_DARWIN . auto/have_headers
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
7
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
8 CORE_INCS="$UNIX_INCS"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
9 CORE_DEPS="$UNIX_DEPS $DARWIN_DEPS"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
10 CORE_SRCS="$UNIX_SRCS $DARWIN_SRCS"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
11
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
12
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
13
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
14 ngx_spacer='
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
15 '
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
16
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
17 # kqueue
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
18
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
19 echo " + kqueue found"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
20 have=NGX_HAVE_KQUEUE . auto/have
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
21 have=NGX_HAVE_CLEAR_EVENT . auto/have
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
22 EVENT_MODULES="$EVENT_MODULES $KQUEUE_MODULE"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
23 CORE_SRCS="$CORE_SRCS $KQUEUE_SRCS"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
24 EVENT_FOUND=YES
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
25 NGX_KQUEUE_CHECKED=YES
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
26
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
27 ngx_feature="kqueue's EVFILT_TIMER"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
28 ngx_feature_name="NGX_HAVE_TIMER_EVENT"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
29 ngx_feature_run=yes
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
30 ngx_feature_incs="#include <sys/event.h>
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
31 #include <sys/time.h>"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
32 ngx_feature_path=
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
33 ngx_feature_libs=
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
34 ngx_feature_test="int kq;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
35 struct kevent kev;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
36 struct timespec ts;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
37
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
38 if ((kq = kqueue()) == -1) return 1;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
39
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
40 kev.ident = 0;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
41 kev.filter = EVFILT_TIMER;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
42 kev.flags = EV_ADD|EV_ENABLE;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
43 kev.fflags = 0;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
44 kev.data = 1000;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
45 kev.udata = 0;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
46
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
47 ts.tv_sec = 0;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
48 ts.tv_nsec = 0;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
49
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
50 if (kevent(kq, &kev, 1, &kev, 1, &ts) == -1) return 1;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
51
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
52 if (kev.flags & EV_ERROR) return 1;"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
53
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
54 . auto/feature
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
55
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
56
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
57 ngx_feature="Darwin 64-bit kqueue millisecond timeout bug"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
58 ngx_feature_name=NGX_DARWIN_KEVENT_BUG
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
59 ngx_feature_run=bug
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
60 ngx_feature_incs="#include <sys/event.h>
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
61 #include <sys/time.h>"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
62 ngx_feature_path=
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
63 ngx_feature_libs=
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
64 ngx_feature_test="int kq;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
65 struct kevent kev;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
66 struct timespec ts;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
67 struct timeval tv, tv0;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
68
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
69 kq = kqueue();
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
70
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
71 ts.tv_sec = 0;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
72 ts.tv_nsec = 999000000;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
73
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
74 gettimeofday(&tv, 0);
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
75 kevent(kq, NULL, 0, &kev, 1, &ts);
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
76 gettimeofday(&tv0, 0);
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
77 timersub(&tv0, &tv, &tv);
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
78
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
79 if (tv.tv_sec * 1000000 + tv.tv_usec < 900000) return 1;"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
80
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
81 . auto/feature
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
82
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
83
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
84 # sendfile()
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
85
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
86 CC_AUX_FLAGS="$CC_AUX_FLAGS"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
87 ngx_feature="sendfile()"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
88 ngx_feature_name="NGX_HAVE_SENDFILE"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
89 ngx_feature_run=yes
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
90 ngx_feature_incs="#include <sys/types.h>
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
91 #include <sys/socket.h>
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
92 #include <sys/uio.h>
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
93 #include <sys/errno.h>"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
94 ngx_feature_path=
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
95 ngx_feature_libs=
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
96 ngx_feature_test="int s = 0, fd = 1;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
97 off_t n; off_t off = 0;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
98 n = sendfile(s, fd, off, &n, NULL, 0);
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
99 if (n == -1 && errno == ENOSYS) return 1"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
100 . auto/feature
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
101
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
102 if [ $ngx_found = yes ]; then
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
103 have=NGX_HAVE_SENDFILE . auto/have
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
104 CORE_SRCS="$CORE_SRCS $DARWIN_SENDFILE_SRCS"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
105 fi
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
106
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
107
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
108 ngx_feature="atomic(3)"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
109 ngx_feature_name=NGX_DARWIN_ATOMIC
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
110 ngx_feature_run=no
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
111 ngx_feature_incs="#include <libkern/OSAtomic.h>"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
112 ngx_feature_path=
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
113 ngx_feature_libs=
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
114 ngx_feature_test="int32_t lock, n;
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
115 n = OSAtomicCompareAndSwap32Barrier(0, 1, lock)"
0b6053502c55 nginx 0.7.7
Igor Sysoev <http://sysoev.ru>
parents:
diff changeset
116 . auto/feature