From cdc463042b9406e4703d21202bc363e86321bb5d Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 7 Dec 2005 14:51:31 +0000 Subject: 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. --- src/event/ngx_event_pipe.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/event') diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c index 0c499a831..ffb7929dd 100644 --- a/src/event/ngx_event_pipe.c +++ b/src/event/ngx_event_pipe.c @@ -131,9 +131,7 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p) */ if (p->upstream->read->available == 0 - && p->upstream->read->pending_eof - /* FreeBSD 5.x-6.x may erroneously report ETIMEDOUT */ - && p->upstream->read->kq_errno != NGX_ETIMEDOUT) + && p->upstream->read->pending_eof) { p->upstream->read->ready = 0; p->upstream->read->eof = 0; -- cgit