diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 14:13:25 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2011-11-01 14:13:25 +0000 |
| commit | a1db86a30b82de2286d32f3ebf71de340d22e2d1 (patch) | |
| tree | af652afea943d5dca11a2cf44e3ab3a8057b1154 /src/os/unix/ngx_process.h | |
| parent | 844ce56e348734b597ba9307dff2d5051a280b52 (diff) | |
| download | nginx-a1db86a30b82de2286d32f3ebf71de340d22e2d1.tar.gz nginx-a1db86a30b82de2286d32f3ebf71de340d22e2d1.tar.bz2 | |
Merging r4195, r4196:
AIO related fixes:
*) Fix for connection drops with AIO.
Connections serving content with AIO to fast clients were dropped with
"client timed out" messages after send_timeout from response start.
*) Fix for socket leak with "aio sendfile" and "limit_rate".
Second aio post happened when timer set by limit_rate expired while we have
aio request in flight, resulting in "second aio post" alert and socket leak.
The patch adds actual protection from aio calls with r->aio already set to
aio sendfile code in ngx_http_copy_filter(). This should fix other cases
as well, e.g. when sending buffered to disk upstream replies while still
talking to upstream.
The ngx_http_writer() is also fixed to handle the above case (though it's
mostly optimization now).
Diffstat (limited to 'src/os/unix/ngx_process.h')
0 files changed, 0 insertions, 0 deletions
