diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2011-09-01 15:10:41 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2011-09-01 15:10:41 +0000 |
| commit | 82854d0d78a24fcbcf16dbf486cf60421f73096b (patch) | |
| tree | a89a94d69a219e5b0f25f1ea2d5c906185485f9e /src/event/ngx_event_pipe.c | |
| parent | a9e3c65d22ad68b994ad7046b243ae459b242ffa (diff) | |
| download | nginx-82854d0d78a24fcbcf16dbf486cf60421f73096b.tar.gz nginx-82854d0d78a24fcbcf16dbf486cf60421f73096b.tar.bz2 | |
Proper setting of read->eof in pipe code.
Setting read->eof to 0 seems to be just a typo. It appeared in
nginx-0.0.1-2003-10-28-18:45:41 import (r164), while identical code in
ngx_recv.c introduced in the same import do actually set read->eof to 1.
Failure to set read->eof to 1 results in EOF not being generally detectable
from connection flags. On the other hand, kqueue won't report any read
events on such a connection since we use EV_CLEAR. This resulted in read
timeouts if such connection was cached and used for another request.
Diffstat (limited to 'src/event/ngx_event_pipe.c')
| -rw-r--r-- | src/event/ngx_event_pipe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/event/ngx_event_pipe.c b/src/event/ngx_event_pipe.c index d01b20446..53d738f0a 100644 --- a/src/event/ngx_event_pipe.c +++ b/src/event/ngx_event_pipe.c @@ -149,7 +149,7 @@ ngx_event_pipe_read_upstream(ngx_event_pipe_t *p) && p->upstream->read->pending_eof) { p->upstream->read->ready = 0; - p->upstream->read->eof = 0; + p->upstream->read->eof = 1; p->upstream_eof = 1; p->read = 1; |
