diff options
author | Igor Sysoev <igor@sysoev.ru> | 2004-12-02 18:40:46 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2004-12-02 18:40:46 +0000 |
commit | 42b12b34fa74c15cfb1746d71cde949f3d5807ef (patch) | |
tree | c44cd3f35d794e6e2be01d516e72737464f76fff /src/http/ngx_http_request.c | |
parent | 4e7b11b02bd42ed284a5f006a13b0635fc33d556 (diff) | |
download | nginx-42b12b34fa74c15cfb1746d71cde949f3d5807ef.tar.gz nginx-42b12b34fa74c15cfb1746d71cde949f3d5807ef.zip |
nginx-0.1.11-RELEASE importrelease-0.1.11
*) Feature: the worker_priority directive.
*) Change: both tcp_nopush and tcp_nodelay directives affect the
transferred response.
*) Bugfix: nginx did not call initgroups().
Thanks to Andrew Sitnikov and Andrei Nigmatulin.
*) Change: now the ngx_http_autoindex_module shows the file size in the
bytes.
*) Bugfix: the ngx_http_autoindex_module returned the 500 error if the
broken symlink was in a directory.
*) Bugfix: the files bigger than 4G could not be transferred using
sendfile.
*) Bugfix: if the backend was resolved to several backends and there
was an error while the response waiting then process may got caught
in an endless loop.
*) Bugfix: the worker process may exit with the "unknown cycle" message
when the /dev/poll method was used.
*) Bugfix: "close() channel failed" errors.
*) Bugfix: the autodetection of the "nobody" and "nogroup" groups.
*) Bugfix: the send_lowat directive did not work on Linux.
*) Bugfix: the segmentation fault occurred if there was no events
section in configuration.
*) Bugfix: nginx could not be built on OpenBSD.
*) Bugfix: the double slashes in "://" in the URI were converted to
":/".
Diffstat (limited to 'src/http/ngx_http_request.c')
-rw-r--r-- | src/http/ngx_http_request.c | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c index b6013fcea..fe3d516cf 100644 --- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -1190,8 +1190,9 @@ static ngx_int_t ngx_http_process_request_header(ngx_http_request_t *r) #if 0 /* MSIE ignores the SSL "close notify" alert */ - - ngx_ssl_set_nosendshut(r->connection->ssl); + if (c->ssl) { + r->connection->ssl->no_send_shut = 1; + } #endif } @@ -1269,7 +1270,7 @@ void ngx_http_finalize_request(ngx_http_request_t *r, int rc) } if (r->connection->read->pending_eof) { -#if (NGX_KQUEUE) +#if (NGX_HAVE_KQUEUE) ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, r->connection->read->kq_errno, "kevent() reported about an closed connection"); @@ -1702,24 +1703,26 @@ static void ngx_http_set_keepalive(ngx_http_request_t *r) } c->tcp_nopush = NGX_TCP_NOPUSH_UNSET; + tcp_nodelay = ngx_tcp_nodelay_and_tcp_nopush ? 1 : 0; } else { - if (clcf->tcp_nodelay && !c->tcp_nodelay) { - tcp_nodelay = 1; + tcp_nodelay = 1; + } - ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay"); + if (tcp_nodelay && clcf->tcp_nodelay && !c->tcp_nodelay) { - if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY, - (const void *) &tcp_nodelay, sizeof(int)) == -1) - { - ngx_connection_error(c, ngx_socket_errno, - "setsockopt(TCP_NODELAY) failed"); - ngx_http_close_connection(c); - return; - } + ngx_log_debug0(NGX_LOG_DEBUG_HTTP, c->log, 0, "tcp_nodelay"); - c->tcp_nodelay = 1; + if (setsockopt(c->fd, IPPROTO_TCP, TCP_NODELAY, + (const void *) &tcp_nodelay, sizeof(int)) == -1) + { + ngx_connection_error(c, ngx_socket_errno, + "setsockopt(TCP_NODELAY) failed"); + ngx_http_close_connection(c); + return; } + + c->tcp_nodelay = 1; } #if 0 @@ -1761,6 +1764,11 @@ static void ngx_http_keepalive_handler(ngx_event_t *rev) ngx_log_error(NGX_LOG_INFO, c->log, rev->kq_errno, "kevent() reported that client %V closed " "keepalive connection", ctx->client); +#if (NGX_HTTP_SSL) + if (c->ssl) { + c->ssl->no_send_shut = 1; + } +#endif ngx_http_close_connection(c); return; } |