]> git.kaiwu.me - nginx.git/commit
projects / nginx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a22bc74) | patch
Merge of r4416:
authorMaxim Dounin <mdounin@mdounin.ru>
Sun, 5 Feb 2012 20:05:11 +0000 (20:05 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Sun, 5 Feb 2012 20:05:11 +0000 (20:05 +0000)
commitf4d00a96acd56fb0d41233f5f1346f051528129a
tree1eac3a0a2be9eb417abba875275894bf05e0903etree | snapshot
parenta22bc749c7b170ec8883ef614dd8dd88fca53aaacommit | diff
Merge of r4416:

Fixed AIO error handling on FreeBSD.

The aio_return() must be called regardless of the error returned by
aio_error().  Not calling it resulted in various problems up to segmentation
faults (as AIO events are level-triggered and were reported again and again).

Additionally, in "aio sendfile" case r->blocked was incremented in case of
error returned from ngx_file_aio_read(), thus causing request hangs.
src/http/ngx_http_copy_filter_module.c diff | blob | history
src/os/unix/ngx_file_aio_read.c diff | blob | history
nginx upstream