Mercurial > hg > nginx
annotate auto/os/linux @ 455:295d97d70c69 release-0.1.2
nginx-0.1.2-RELEASE import
*) Feature: the --user=USER, --group=GROUP, and --with-ld-opt=OPTIONS
options in configure.
*) Feature: the server_name directive supports *.domain.tld.
*) Bugfix: the portability improvements.
*) Bugfix: if configuration file was set in command line, the
reconfiguration was impossible; the bug had appeared in 0.1.1.
*) Bugfix: proxy module may get caught in an endless loop when sendfile
is not used.
*) Bugfix: with sendfile the response was not recoded according to the
charset module directives; the bug had appeared in 0.1.1.
*) Bugfix: very seldom bug in the kqueue processing.
*) Bugfix: the gzip module compressed the proxied responses that was
already compressed.
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Thu, 21 Oct 2004 15:34:38 +0000 |
| parents | 42d11f017717 |
| children | a88a3e4e158f |
| rev | line source |
|---|---|
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
355
diff
changeset
|
1 |
|
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
355
diff
changeset
|
2 # Copyright (C) Igor Sysoev |
|
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
355
diff
changeset
|
3 |
|
196
11fbd0fc041d
nginx-0.0.1-2003-11-26-18:42:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
4 |
| 455 | 5 cat << END >> $NGX_AUTO_HEADERS_H |
| 6 | |
| 7 #ifndef NGX_LINUX | |
| 8 #define NGX_LINUX 1 | |
| 9 #endif | |
| 10 | |
| 11 END | |
| 12 | |
|
196
11fbd0fc041d
nginx-0.0.1-2003-11-26-18:42:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
13 CORE_INCS="$UNIX_INCS" |
|
11fbd0fc041d
nginx-0.0.1-2003-11-26-18:42:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
14 CORE_DEPS="$UNIX_DEPS $LINUX_DEPS" |
|
249
2a0540287298
nginx-0.0.2-2004-02-03-19:43:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
248
diff
changeset
|
15 CORE_SRCS="$UNIX_SRCS $LINUX_SRCS" |
|
2a0540287298
nginx-0.0.2-2004-02-03-19:43:54 import
Igor Sysoev <igor@sysoev.ru>
parents:
248
diff
changeset
|
16 EVENT_MODULES="$EVENT_MODULES" |
|
196
11fbd0fc041d
nginx-0.0.1-2003-11-26-18:42:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
17 |
| 455 | 18 ngx_spacer=' |
| 19 ' | |
|
283
8f65fee68270
nginx-0.0.2-2004-03-10-20:55:19 import
Igor Sysoev <igor@sysoev.ru>
parents:
259
diff
changeset
|
20 |
| 455 | 21 CC_AUX_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" |
|
196
11fbd0fc041d
nginx-0.0.1-2003-11-26-18:42:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
22 |
|
351
af4c6b45a687
nginx-0.0.4-2004-06-10-22:36:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
298
diff
changeset
|
23 # Linux kernel version |
|
af4c6b45a687
nginx-0.0.4-2004-06-10-22:36:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
298
diff
changeset
|
24 |
|
af4c6b45a687
nginx-0.0.4-2004-06-10-22:36:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
298
diff
changeset
|
25 version=`grep "#define LINUX_VERSION_CODE" /usr/include/linux/version.h \ |
|
af4c6b45a687
nginx-0.0.4-2004-06-10-22:36:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
298
diff
changeset
|
26 | sed -e 's/^.* \(.*\)$/\1/'` |
|
af4c6b45a687
nginx-0.0.4-2004-06-10-22:36:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
298
diff
changeset
|
27 |
|
af4c6b45a687
nginx-0.0.4-2004-06-10-22:36:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
298
diff
changeset
|
28 |
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
355
diff
changeset
|
29 # enable the rt signals on Linux 2.2.19 and onward |
|
351
af4c6b45a687
nginx-0.0.4-2004-06-10-22:36:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
298
diff
changeset
|
30 |
|
353
b8d3d7dbfcc8
nginx-0.0.5-2004-06-11-20:58:33 import
Igor Sysoev <igor@sysoev.ru>
parents:
351
diff
changeset
|
31 if [ $version -ge 131609 -o $EVENT_RTSIG = YES ]; then |
|
351
af4c6b45a687
nginx-0.0.4-2004-06-10-22:36:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
298
diff
changeset
|
32 echo " + using rt signals" |
|
af4c6b45a687
nginx-0.0.4-2004-06-10-22:36:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
298
diff
changeset
|
33 have=HAVE_RTSIG . auto/have |
|
af4c6b45a687
nginx-0.0.4-2004-06-10-22:36:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
298
diff
changeset
|
34 EVENT_MODULES="$EVENT_MODULES $RTSIG_MODULE" |
|
af4c6b45a687
nginx-0.0.4-2004-06-10-22:36:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
298
diff
changeset
|
35 CORE_SRCS="$CORE_SRCS $RTSIG_SRCS" |
|
af4c6b45a687
nginx-0.0.4-2004-06-10-22:36:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
298
diff
changeset
|
36 EVENT_FOUND=YES |
|
af4c6b45a687
nginx-0.0.4-2004-06-10-22:36:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
298
diff
changeset
|
37 fi |
|
af4c6b45a687
nginx-0.0.4-2004-06-10-22:36:57 import
Igor Sysoev <igor@sysoev.ru>
parents:
298
diff
changeset
|
38 |
|
248
e885208c518b
nginx-0.0.2-2004-02-03-00:19:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
245
diff
changeset
|
39 |
|
e885208c518b
nginx-0.0.2-2004-02-03-00:19:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
245
diff
changeset
|
40 # epoll, EPOLLET version |
|
245
e6c005b66b3a
nginx-0.0.1-2004-01-30-00:45:01 import
Igor Sysoev <igor@sysoev.ru>
parents:
198
diff
changeset
|
41 |
| 455 | 42 ngx_feature="epoll" |
| 43 ngx_feature_name="epoll" | |
| 44 ngx_feature_run=yes | |
| 45 ngx_feature_incs="#include <sys/epoll.h>" | |
| 46 ngx_feature_libs= | |
| 47 ngx_feature_test="int efd = 0, fd = 1, n; | |
| 48 struct epoll_event ee; | |
| 49 ee.events = EPOLLIN|EPOLLOUT|EPOLLET; | |
| 50 ee.data.ptr = NULL; | |
| 51 efd = epoll_create(100); | |
| 52 if (efd == -1) return 1;" | |
| 53 . auto/feature | |
|
248
e885208c518b
nginx-0.0.2-2004-02-03-00:19:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
245
diff
changeset
|
54 |
|
e885208c518b
nginx-0.0.2-2004-02-03-00:19:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
245
diff
changeset
|
55 if [ $ngx_found = yes ]; then |
|
253
b6793bc5034b
nginx-0.0.2-2004-02-09-10:46:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
249
diff
changeset
|
56 have=HAVE_EPOLL . auto/have |
|
259
d30f2c39caae
nginx-0.0.2-2004-02-12-23:57:10 import
Igor Sysoev <igor@sysoev.ru>
parents:
258
diff
changeset
|
57 have=HAVE_CLEAR_EVENT . auto/have |
|
248
e885208c518b
nginx-0.0.2-2004-02-03-00:19:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
245
diff
changeset
|
58 CORE_SRCS="$CORE_SRCS $EPOLL_SRCS" |
|
245
e6c005b66b3a
nginx-0.0.1-2004-01-30-00:45:01 import
Igor Sysoev <igor@sysoev.ru>
parents:
198
diff
changeset
|
59 EVENT_MODULES="$EVENT_MODULES $EPOLL_MODULE" |
|
248
e885208c518b
nginx-0.0.2-2004-02-03-00:19:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
245
diff
changeset
|
60 EVENT_FOUND=YES |
|
245
e6c005b66b3a
nginx-0.0.1-2004-01-30-00:45:01 import
Igor Sysoev <igor@sysoev.ru>
parents:
198
diff
changeset
|
61 fi |
|
e6c005b66b3a
nginx-0.0.1-2004-01-30-00:45:01 import
Igor Sysoev <igor@sysoev.ru>
parents:
198
diff
changeset
|
62 |
|
e6c005b66b3a
nginx-0.0.1-2004-01-30-00:45:01 import
Igor Sysoev <igor@sysoev.ru>
parents:
198
diff
changeset
|
63 |
|
248
e885208c518b
nginx-0.0.2-2004-02-03-00:19:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
245
diff
changeset
|
64 # sendfile() |
|
e885208c518b
nginx-0.0.2-2004-02-03-00:19:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
245
diff
changeset
|
65 |
| 455 | 66 CC_AUX_FLAGS="-D_GNU_SOURCE" |
| 67 ngx_feature="sendfile()" | |
| 68 ngx_feature_name="sendfile" | |
| 69 ngx_feature_run=no | |
| 70 ngx_feature_incs="#include <sys/sendfile.h>" | |
| 71 ngx_feature_libs= | |
| 72 ngx_feature_test="int s = 0, fd = 1; | |
| 73 ssize_t n; off_t off = 0; | |
| 74 n = sendfile(s, fd, &off, 1)" | |
| 75 . auto/feature | |
|
248
e885208c518b
nginx-0.0.2-2004-02-03-00:19:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
245
diff
changeset
|
76 |
|
e885208c518b
nginx-0.0.2-2004-02-03-00:19:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
245
diff
changeset
|
77 if [ $ngx_found = yes ]; then |
|
e885208c518b
nginx-0.0.2-2004-02-03-00:19:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
245
diff
changeset
|
78 CORE_SRCS="$CORE_SRCS $LINUX_SENDFILE_SRCS" |
|
e885208c518b
nginx-0.0.2-2004-02-03-00:19:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
245
diff
changeset
|
79 fi |
|
e885208c518b
nginx-0.0.2-2004-02-03-00:19:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
245
diff
changeset
|
80 |
|
e885208c518b
nginx-0.0.2-2004-02-03-00:19:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
245
diff
changeset
|
81 |
|
e885208c518b
nginx-0.0.2-2004-02-03-00:19:52 import
Igor Sysoev <igor@sysoev.ru>
parents:
245
diff
changeset
|
82 # sendfile64() |
|
196
11fbd0fc041d
nginx-0.0.1-2003-11-26-18:42:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
83 |
| 455 | 84 CC_AUX_FLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" |
| 85 ngx_feature="sendfile64()" | |
| 86 ngx_feature_name="HAVE_SENDFILE64" | |
| 87 ngx_feature_run=no | |
| 88 ngx_feature_incs="#include <sys/sendfile.h>" | |
| 89 ngx_feature_libs= | |
| 90 ngx_feature_test="int s = 0, fd = 1; | |
| 91 ssize_t n; off_t off = 0; | |
| 92 n = sendfile(s, fd, &off, 1)" | |
| 93 . auto/feature | |
|
196
11fbd0fc041d
nginx-0.0.1-2003-11-26-18:42:18 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
94 |
|
253
b6793bc5034b
nginx-0.0.2-2004-02-09-10:46:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
249
diff
changeset
|
95 |
| 455 | 96 ngx_include="sys/prctl.h"; . auto/include |
| 97 | |
|
253
b6793bc5034b
nginx-0.0.2-2004-02-09-10:46:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
249
diff
changeset
|
98 # prctl(PR_SET_DUMPABLE) |
|
b6793bc5034b
nginx-0.0.2-2004-02-09-10:46:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
249
diff
changeset
|
99 |
| 455 | 100 ngx_feature="prctl(PR_SET_DUMPABLE)" |
| 101 ngx_feature_name="HAVE_PR_SET_DUMPABLE" | |
| 102 ngx_feature_run=yes | |
| 103 ngx_feature_incs="#include <sys/prctl.h>" | |
| 104 ngx_feature_libs= | |
| 105 ngx_feature_test="if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) == -1) return 1" | |
| 106 . auto/feature |