Mercurial > hg > nginx-vendor-current
view src/os/unix/ngx_socket.c @ 342:4276c2f1f434 NGINX_0_6_15
nginx 0.6.15
*) Feature: cygwin compatibility.
Thanks to Vladimir Kutakov.
*) Feature: the "merge_slashes" directive.
*) Feature: the "gzip_vary" directive.
*) Feature: the "server_tokens" directive.
*) Bugfix: nginx did not unescape URI in the "include" SSI command.
*) Bugfix: the segmentation fault was occurred on start or while
reconfiguration if variable was used in the "charset" or
"source_charset" directives.
*) Bugfix: nginx returned the 400 response on requests like
"GET http://www.domain.com HTTP/1.0".
Thanks to James Oakley.
*) Bugfix: if request with request body was redirected using the
"error_page" directive, then nginx tried to read the request body
again; bug appeared in 0.6.7.
*) Bugfix: a segmentation fault occurred in worker process if no
server_name was explicitly defined for server processing request;
bug appeared in 0.6.7.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 22 Oct 2007 00:00:00 +0400 |
parents | 5bef04fc3fd5 |
children | d0f7a625f27c |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev */ #include <ngx_config.h> #include <ngx_core.h> /* * ioctl(FIONBIO) sets a non-blocking mode with the single syscall * while fcntl(F_SETFL, O_NONBLOCK) needs to learn the current state * using fcntl(F_GETFL). * * 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. */ #if (NGX_HAVE_FIONBIO) int ngx_nonblocking(ngx_socket_t s) { int nb; nb = 1; return ioctl(s, FIONBIO, &nb); } int ngx_blocking(ngx_socket_t s) { int nb; nb = 0; return ioctl(s, FIONBIO, &nb); } #endif #if (NGX_FREEBSD) int ngx_tcp_nopush(ngx_socket_t s) { int tcp_nopush; tcp_nopush = 1; return setsockopt(s, IPPROTO_TCP, TCP_NOPUSH, (const void *) &tcp_nopush, sizeof(int)); } int ngx_tcp_push(ngx_socket_t s) { int tcp_nopush; tcp_nopush = 0; return setsockopt(s, IPPROTO_TCP, TCP_NOPUSH, (const void *) &tcp_nopush, sizeof(int)); } #elif (NGX_LINUX) int ngx_tcp_nopush(ngx_socket_t s) { int cork; cork = 1; return setsockopt(s, IPPROTO_TCP, TCP_CORK, (const void *) &cork, sizeof(int)); } int ngx_tcp_push(ngx_socket_t s) { int cork; cork = 0; return setsockopt(s, IPPROTO_TCP, TCP_CORK, (const void *) &cork, sizeof(int)); } #else int ngx_tcp_nopush(ngx_socket_t s) { return 0; } int ngx_tcp_push(ngx_socket_t s) { return 0; } #endif