From c2068d08f097383b8eac508117e6d405627e6cef Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 19 Oct 2005 12:33:58 +0000 Subject: nginx-0.3.3-RELEASE import *) 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; the bug had 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. --- src/os/unix/ngx_socket.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/os/unix/ngx_socket.c') diff --git a/src/os/unix/ngx_socket.c b/src/os/unix/ngx_socket.c index 121958977..60885ddd5 100644 --- a/src/os/unix/ngx_socket.c +++ b/src/os/unix/ngx_socket.c @@ -13,7 +13,7 @@ * while fcntl(F_SETFL, ~O_NONBLOCK) needs to learn before * the previous state using fcntl(F_GETFL). * - * ioctl() and fcntl() are syscalls on at least FreeBSD 2.x, Linux 2.2 + * ioctl() and fcntl() are syscalls at least in FreeBSD 2.x, Linux 2.2 * and Solaris 7. * * ioctl() in Linux 2.4 and 2.6 uses BKL, however, fcntl(F_SETFL) uses it too. @@ -73,6 +73,7 @@ ngx_tcp_push(ngx_socket_t s) #elif (NGX_LINUX) + int ngx_tcp_nopush(ngx_socket_t s) { @@ -84,6 +85,7 @@ ngx_tcp_nopush(ngx_socket_t s) (const void *) &cork, sizeof(int)); } + int ngx_tcp_push(ngx_socket_t s) { @@ -103,6 +105,7 @@ ngx_tcp_nopush(ngx_socket_t s) return 0; } + int ngx_tcp_push(ngx_socket_t s) { -- cgit v1.2.3