[PATCH 02 of 15] Proper setting of read->eof in pipe code
mdounin at mdounin.ru
Sun Sep 4 11:33:49 UTC 2011
# HG changeset patch
# User Maxim Dounin <mdounin at mdounin.ru>
# Date 1314887926 -14400
# Node ID 028614c84148775551b669785a1b4d637b831678
# Parent 18293703cbf48c934f8f601c235b7d9e06e93be5
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.
diff --git 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_p
p->upstream->read->ready = 0;
- p->upstream->read->eof = 0;
+ p->upstream->read->eof = 1;
p->upstream_eof = 1;
p->read = 1;
More information about the nginx-devel