diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-12-07 14:51:31 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-12-07 14:51:31 +0000 |
| commit | cdc463042b9406e4703d21202bc363e86321bb5d (patch) | |
| tree | 1f6d050377dafbf42bb3d7c8c7e15e86939500ff /src/event/ngx_event_pipe.c | |
| parent | c20f0c28ff5478dcafd2ce2e5056da3757eb62ff (diff) | |
| download | nginx-cdc463042b9406e4703d21202bc363e86321bb5d.tar.gz nginx-cdc463042b9406e4703d21202bc363e86321bb5d.zip | |
nginx-0.3.15-RELEASE importrelease-0.3.15
*) 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.
Diffstat (limited to 'src/event/ngx_event_pipe.c')
| -rw-r--r-- | src/event/ngx_event_pipe.c | 4 |
1 files changed, 1 insertions, 3 deletions
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; |