Mercurial > hg > nginx-ranges

comparison src/os/unix/ngx_socket.c @ 112:408f195b3482 NGINX_0_3_3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.3.3 *) Change: the "bl" and "af" parameters of the "listen" directive was renamed to the "backlog" and "accept_filter". *) Feature: the "rcvbuf" and "sndbuf" parameters of the "listen" directive. *) Change: the "$msec" log parameter does not require now the additional the gettimeofday() system call. *) Feature: the -t switch now tests the "listen" directives. *) Bugfix: if the invalid address was specified in the "listen" directive, then after the -HUP signal nginx left an open socket in the CLOSED state. *) Bugfix: the mime type may be incorrectly set to default value for index file with variable in the name; bug appeared in 0.3.0. *) Feature: the "timer_resolution" directive. *) Feature: the millisecond "$upstream_response_time" log parameter. *) Bugfix: a temporary file with client request body now is removed just after the response header was transferred to a client. *) Bugfix: OpenSSL 0.9.6 compatibility. *) Bugfix: the SSL certificate and key file paths could not be relative. *) Bugfix: the "ssl_prefer_server_ciphers" directive did not work in the ngx_imap_ssl_module. *) Bugfix: the "ssl_protocols" directive allowed to specify the single protocol only.
author Igor Sysoev <http://sysoev.ru>
date Wed, 19 Oct 2005 00:00:00 +0400
parents 72eb30262aac
children 003bd800ec2a
comparison
equal deleted inserted replaced
111:a175b609c76d 112:408f195b3482
11 /* 11 /*
12 * ioctl(FIONBIO) sets a blocking mode with the single syscall 12 * ioctl(FIONBIO) sets a blocking mode with the single syscall
13 * while fcntl(F_SETFL, ~O_NONBLOCK) needs to learn before 13 * while fcntl(F_SETFL, ~O_NONBLOCK) needs to learn before
14 * the previous state using fcntl(F_GETFL). 14 * the previous state using fcntl(F_GETFL).
15 * 15 *
16 * ioctl() and fcntl() are syscalls on at least FreeBSD 2.x, Linux 2.2 16 * ioctl() and fcntl() are syscalls at least in FreeBSD 2.x, Linux 2.2
17 * and Solaris 7. 17 * and Solaris 7.
18 * 18 *
19 * ioctl() in Linux 2.4 and 2.6 uses BKL, however, fcntl(F_SETFL) uses it too. 19 * ioctl() in Linux 2.4 and 2.6 uses BKL, however, fcntl(F_SETFL) uses it too.
20 */ 20 */
21 21
71 (const void *) &tcp_nopush, sizeof(int)); 71 (const void *) &tcp_nopush, sizeof(int));
72 } 72 }
73 73
74 #elif (NGX_LINUX) 74 #elif (NGX_LINUX)
75 75
76
76 int 77 int
77 ngx_tcp_nopush(ngx_socket_t s) 78 ngx_tcp_nopush(ngx_socket_t s)
78 { 79 {
79 int cork; 80 int cork;
80 81
81 cork = 1; 82 cork = 1;
82 83
83 return setsockopt(s, IPPROTO_TCP, TCP_CORK, 84 return setsockopt(s, IPPROTO_TCP, TCP_CORK,
84 (const void *) &cork, sizeof(int)); 85 (const void *) &cork, sizeof(int));
85 } 86 }
87
86 88
87 int 89 int
88 ngx_tcp_push(ngx_socket_t s) 90 ngx_tcp_push(ngx_socket_t s)
89 { 91 {
90 int cork; 92 int cork;
101 ngx_tcp_nopush(ngx_socket_t s) 103 ngx_tcp_nopush(ngx_socket_t s)
102 { 104 {
103 return 0; 105 return 0;
104 } 106 }
105 107
108
106 int 109 int
107 ngx_tcp_push(ngx_socket_t s) 110 ngx_tcp_push(ngx_socket_t s)
108 { 111 {
109 return 0; 112 return 0;
110 } 113 }