Mercurial > hg > nginx
diff src/http/ngx_http_request.c @ 587:284cc140593b release-0.3.15
nginx-0.3.15-RELEASE import
*) Feature: the new 444 code of the "return" directive to close
connection.
*) Feature: the "so_keepalive" directive in IMAP/POP3 proxy.
*) Bugfix: if there are unclosed connection nginx now calls abort()
only on gracefull quit and active "debug_points" directive.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 07 Dec 2005 14:51:31 +0000 |
parents | 4e296b7d25bf |
children | d4e858a5751a |
line wrap: on
line diff
--- a/src/http/ngx_http_request.c Mon Dec 05 16:59:05 2005 +0000 +++ b/src/http/ngx_http_request.c Wed Dec 07 14:51:31 2005 +0000 @@ -1460,6 +1460,11 @@ if (rc >= NGX_HTTP_SPECIAL_RESPONSE || rc == NGX_HTTP_NO_CONTENT) { + if (rc == NGX_HTTP_CLOSE) { + ngx_http_close_request(r, rc); + return; + } + if (r->main == r) { if (r->connection->read->timer_set) { ngx_del_timer(r->connection->read); @@ -1556,6 +1561,7 @@ ngx_del_timer(r->connection->write); } +#if 0 if (r->connection->read->pending_eof) { #if (NGX_HAVE_KQUEUE) ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, @@ -1565,6 +1571,7 @@ ngx_http_close_request(r, 0); return; } +#endif if (!ngx_terminate && !ngx_exiting @@ -2046,10 +2053,7 @@ #if (NGX_HAVE_KQUEUE) if (ngx_event_flags & NGX_USE_KQUEUE_EVENT) { - if (rev->pending_eof - /* FreeBSD 5.x-6.x may erroneously report ETIMEDOUT */ - && rev->kq_errno != NGX_ETIMEDOUT) - { + if (rev->pending_eof) { c->log->handler = NULL; ngx_log_error(NGX_LOG_INFO, c->log, rev->kq_errno, "kevent() reported that client %V closed "