Mercurial > hg > nginx-ranges
annotate src/os/unix/ngx_socket.c @ 326:9fc4ab6673f9 NGINX_0_6_7
nginx 0.6.7
*) Change: now the paths specified in the "include",
"auth_basic_user_file", "perl_modules", "ssl_certificate",
"ssl_certificate_key", and "ssl_client_certificate" directives are
relative to directory of nginx configuration file nginx.conf, but
not to nginx prefix directory.
*) Change: the --sysconfdir=PATH option in configure was canceled.
*) Change: the special make target "upgrade1" was defined for online
upgrade of 0.1.x versions.
*) Feature: the "server_name" and "valid_referers" directives support
regular expressions.
*) Feature: the "server" directive in the "upstream" context supports
the "backup" parameter.
*) Feature: the ngx_http_perl_module supports the
$r->discard_request_body.
*) Feature: the "add_header Last-Modified ..." directive changes the
"Last-Modified" response header line.
*) Bugfix: if an response different than 200 was returned to an request
with body and connection went to the keep-alive state after the
request, then nginx returned 400 for the next request.
*) Bugfix: a segmentation fault occurred in worker process if invalid
address was set in the "auth_http" directive.
*) Bugfix: now nginx uses default listen backlog value 511 on all
platforms except FreeBSD.
Thanks to Jiang Hong.
*) Bugfix: a worker process may got caught in an endless loop, if an
"server" inside "upstream" block was marked as "down"; bug appeared
in 0.6.6.
*) Bugfix: now Solaris sendfilev() is not used to transfer the client
request body to FastCGI-server via the unix domain socket.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 15 Aug 2007 00:00:00 +0400 |
parents | 5bef04fc3fd5 |
children |
rev | line source |
---|---|
0 | 1 |
2 /* | |
3 * Copyright (C) Igor Sysoev | |
4 */ | |
5 | |
6 | |
7 #include <ngx_config.h> | |
8 #include <ngx_core.h> | |
9 | |
10 | |
11 /* | |
236 | 12 * ioctl(FIONBIO) sets a non-blocking mode with the single syscall |
13 * while fcntl(F_SETFL, O_NONBLOCK) needs to learn the current state | |
14 * using fcntl(F_GETFL). | |
0 | 15 * |
112 | 16 * ioctl() and fcntl() are syscalls at least in FreeBSD 2.x, Linux 2.2 |
0 | 17 * and Solaris 7. |
18 * | |
2 | 19 * ioctl() in Linux 2.4 and 2.6 uses BKL, however, fcntl(F_SETFL) uses it too. |
0 | 20 */ |
21 | |
22 | |
18 | 23 #if (NGX_HAVE_FIONBIO) |
0 | 24 |
50 | 25 int |
26 ngx_nonblocking(ngx_socket_t s) | |
0 | 27 { |
286 | 28 int nb; |
0 | 29 |
30 nb = 1; | |
31 | |
32 return ioctl(s, FIONBIO, &nb); | |
33 } | |
34 | |
35 | |
50 | 36 int |
37 ngx_blocking(ngx_socket_t s) | |
0 | 38 { |
286 | 39 int nb; |
0 | 40 |
41 nb = 0; | |
42 | |
43 return ioctl(s, FIONBIO, &nb); | |
44 } | |
45 | |
46 #endif | |
47 | |
48 | |
4 | 49 #if (NGX_FREEBSD) |
0 | 50 |
50 | 51 int |
52 ngx_tcp_nopush(ngx_socket_t s) | |
0 | 53 { |
54 int tcp_nopush; | |
55 | |
56 tcp_nopush = 1; | |
57 | |
58 return setsockopt(s, IPPROTO_TCP, TCP_NOPUSH, | |
59 (const void *) &tcp_nopush, sizeof(int)); | |
60 } | |
61 | |
62 | |
50 | 63 int |
64 ngx_tcp_push(ngx_socket_t s) | |
0 | 65 { |
66 int tcp_nopush; | |
67 | |
68 tcp_nopush = 0; | |
69 | |
70 return setsockopt(s, IPPROTO_TCP, TCP_NOPUSH, | |
71 (const void *) &tcp_nopush, sizeof(int)); | |
72 } | |
73 | |
4 | 74 #elif (NGX_LINUX) |
0 | 75 |
112 | 76 |
50 | 77 int |
78 ngx_tcp_nopush(ngx_socket_t s) | |
0 | 79 { |
80 int cork; | |
81 | |
82 cork = 1; | |
83 | |
84 return setsockopt(s, IPPROTO_TCP, TCP_CORK, | |
85 (const void *) &cork, sizeof(int)); | |
86 } | |
87 | |
112 | 88 |
50 | 89 int |
90 ngx_tcp_push(ngx_socket_t s) | |
0 | 91 { |
92 int cork; | |
93 | |
94 cork = 0; | |
95 | |
96 return setsockopt(s, IPPROTO_TCP, TCP_CORK, | |
97 (const void *) &cork, sizeof(int)); | |
98 } | |
99 | |
100 #else | |
101 | |
50 | 102 int |
103 ngx_tcp_nopush(ngx_socket_t s) | |
0 | 104 { |
50 | 105 return 0; |
0 | 106 } |
107 | |
112 | 108 |
50 | 109 int |
110 ngx_tcp_push(ngx_socket_t s) | |
0 | 111 { |
50 | 112 return 0; |
0 | 113 } |
114 | |
115 #endif |