Mercurial > hg > nginx
diff src/os/unix/ngx_linux_sendfile_chain.c @ 483:621229427cba release-0.1.16
nginx-0.1.16-RELEASE import
*) Bugfix: if the response were transferred by chunks, then on the HEAD
request the final chunk was issued.
*) Bugfix: the "Connection: keep-alive" header were issued, even if the
keepalive_timeout directive forbade the keep-alive use.
*) Bugfix: the errors in the ngx_http_fastcgi_module caused the
segmentation faults.
*) Bugfix: the compressed response encrypted by SSL may not transferred
complete.
*) Bugfix: the TCP-specific TCP_NODELAY, TCP_NOPSUH, and TCP_CORK
options, are not used for the unix domain sockets.
*) Feature: the rewrite directive supports the arguments rewriting.
*) Bugfix: the response code 400 was returned for the POST request with
the "Content-Length: 0" header; the bug had appeared in 0.1.14.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 25 Jan 2005 12:27:35 +0000 |
parents | c52408583801 |
children | 45a460f82aec |
line wrap: on
line diff
--- a/src/os/unix/ngx_linux_sendfile_chain.c Wed Jan 19 13:10:56 2005 +0000 +++ b/src/os/unix/ngx_linux_sendfile_chain.c Tue Jan 25 12:27:35 2005 +0000 @@ -89,7 +89,18 @@ #if 1 if (!ngx_buf_in_memory(cl->buf) && !cl->buf->in_file) { ngx_log_error(NGX_LOG_ALERT, c->log, 0, - "zero size buf in sendfile"); + "zero size buf in sendfile " + "t:%d r:%d f:%d %p %p-%p %p %O-%O", + cl->buf->temporary, + cl->buf->recycled, + cl->buf->in_file, + cl->buf->start, + cl->buf->pos, + cl->buf->last, + cl->buf->file, + cl->buf->file_pos, + cl->buf->file_last); + ngx_debug_point(); } #endif @@ -129,7 +140,7 @@ { /* the TCP_CORK and TCP_NODELAY are mutually exclusive */ - if (c->tcp_nodelay) { + if (c->tcp_nodelay == NGX_TCP_NODELAY_SET) { tcp_nodelay = 0; @@ -146,20 +157,20 @@ if (err != NGX_EINTR) { wev->error = 1; - ngx_connection_error(c, ngx_socket_errno, + ngx_connection_error(c, err, "setsockopt(TCP_NODELAY) failed"); return NGX_CHAIN_ERROR; } } else { - c->tcp_nodelay = 0; + c->tcp_nodelay = NGX_TCP_NODELAY_UNSET; ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "no tcp_nodelay"); } } - if (!c->tcp_nodelay) { + if (c->tcp_nodelay == NGX_TCP_NODELAY_UNSET) { if (ngx_tcp_nopush(c->fd) == NGX_ERROR) { err = ngx_errno;