summaryrefslogtreecommitdiff
path: root/auto/os/linux
diff options
context:
space:
mode:
authorNGINX team <nginx@nginx.org>2012-03-28 14:00:08 +0000
committerJon Kolb <jon@b0g.us>2012-03-28 14:00:08 +0000
commit60a50f7b445d1ac18ea0b1ff140745b6844c6794 (patch)
treeb2edd9e3a38a3e58a0b348b6988e55f7f8be7cd0 /auto/os/linux
parent3e2cd7431101761df65f2242c667c037599aa0c4 (diff)
downloadnginx-60a50f7b445d1ac18ea0b1ff140745b6844c6794.tar.gz
Changes with nginx 1.1.18 28 Mar 2012v1.1.18
*) Change: keepalive connections are no longer disabled for Safari by default. *) Feature: the $connection_requests variable. *) Feature: $tcpinfo_rtt, $tcpinfo_rttvar, $tcpinfo_snd_cwnd and $tcpinfo_rcv_space variables. *) Feature: the "worker_cpu_affinity" directive now works on FreeBSD. *) Feature: the "xslt_param" and "xslt_string_param" directives. Thanks to Samuel Behan. *) Bugfix: in configure tests. Thanks to Piotr Sikora. *) Bugfix: in the ngx_http_xslt_filter_module. *) Bugfix: nginx could not be built on Debian GNU/Hurd.
Diffstat (limited to 'auto/os/linux')
-rw-r--r--auto/os/linux9
1 files changed, 5 insertions, 4 deletions
diff --git a/auto/os/linux b/auto/os/linux
index 0b2173cae..c506d3dc3 100644
--- a/auto/os/linux
+++ b/auto/os/linux
@@ -52,7 +52,7 @@ ngx_feature_run=yes
ngx_feature_incs="#include <sys/epoll.h>"
ngx_feature_path=
ngx_feature_libs=
-ngx_feature_test="int efd = 0, fd = 1, n;
+ngx_feature_test="int efd = 0;
struct epoll_event ee;
ee.events = EPOLLIN|EPOLLOUT|EPOLLET;
ee.data.ptr = NULL;
@@ -128,8 +128,9 @@ ngx_feature_run=no
ngx_feature_incs="#include <sched.h>"
ngx_feature_path=
ngx_feature_libs=
-ngx_feature_test="long mask = 0;
- sched_setaffinity(0, 32, (cpu_set_t *) &mask)"
+ngx_feature_test="cpu_set_t mask;
+ CPU_ZERO(&mask);
+ sched_setaffinity(0, sizeof(cpu_set_t), &mask)"
. auto/feature
@@ -142,7 +143,7 @@ ngx_feature_incs="#include <crypt.h>"
ngx_feature_path=
ngx_feature_libs=-lcrypt
ngx_feature_test="struct crypt_data cd;
- crypt_r(NULL, NULL, &cd);"
+ crypt_r(\"key\", \"salt\", &cd);"
. auto/feature