annotate src/mysql/config @ 6423:c5f81dcf97a7
Copy filter: fixed sendfile aio handlers to set ctx->aio.
Sendfile handlers (aio preload and thread handler) are called within
ctx->output_filter() in ngx_output_chain(), and hence ctx->aio cannot
be set directly in ngx_output_chain(). Meanwhile, it must be set to
make sure loop within ngx_output_chain() will be properly terminated.
There are no known cases that trigger the problem, though in theory
something like aio + sub filter (something that needs body in memory,
and can also free some memory buffers) + sendfile can result in
"task already active" and "second aio post" alerts.
The fix is to set ctx->aio in ngx_http_copy_aio_sendfile_preload()
and ngx_http_copy_thread_handler().
For consistency, ctx->aio is no longer set explicitly in
ngx_output_chain_copy_buf(), as it's now done in
ngx_http_copy_thread_handler().
author |
Maxim Dounin <mdounin@mdounin.ru> |
date |
Thu, 03 Mar 2016 21:14:19 +0300 |
parents |
7cbef16c71a1 |
children |
|
rev |
line source |
653
|
1
|
|
2 ngx_addon_name=ngx_mysql
|
|
3
|
|
4 HTTP_MODULES="$HTTP_MODULES ngx_http_mysql_test_module"
|
|
5
|
|
6 HTTP_INCS="$HTTP_INCS $ngx_addon_dir"
|
|
7 HTTP_DEPS="$HTTP_DEPS $ngx_addon_dir/ngx_mysql.h"
|
|
8 #CORE_LIBS="$CORE_LIBS -lmd"
|
|
9
|
|
10 USE_SHA1=YES
|
|
11
|
|
12 NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_mysql.c"
|
|
13 NGX_ADDON_SRCS="$NGX_ADDON_SRCS $ngx_addon_dir/ngx_http_mysql_test.c"
|