summaryrefslogtreecommitdiffhomepage
path: root/src/core/ngx_conf_file.c
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2013-02-11 13:59:08 +0000
committerMaxim Dounin <mdounin@mdounin.ru>2013-02-11 13:59:08 +0000
commit8fea19793236c9a21ac13599aafb3cec746640fd (patch)
treea5717021c798dccd5681fbc70efe0cfe0dbc80fc /src/core/ngx_conf_file.c
parentfba705e4f54d608db58e456bc52b4c9cdd1d9e88 (diff)
downloadnginx-8fea19793236c9a21ac13599aafb3cec746640fd.tar.gz
nginx-8fea19793236c9a21ac13599aafb3cec746640fd.tar.bz2
Merge of r4979, r4982: image filter configuration inheritance.
*) Image filter: configuration inheritance fixes. The image_filter_jpeg_quality, image_filter_sharpen and "image_filter rotate" were inherited incorrectly if a directive with variables was defined, and then redefined to a literal value, i.e. in configurations like image_filter_jpeg_quality $arg_q; location / { image_filter_jpeg_quality 50; } Patch by Ian Babrou, with minor changes. *) Image filter: fixed image_filter rotate inheritance. Configurations like location /i/ { image_filter resize 200 200; image_filter rotate 180; location /i/foo/ { image_filter resize 200 200; } } resulted in rotation incorrectly applied in the location /i/foo, without any way to clear it. Fix is to handle conf->angle/conf->acv consistently with other filter variables and do not try to inherit them if there are transformations defined for current location.
Diffstat (limited to 'src/core/ngx_conf_file.c')
0 files changed, 0 insertions, 0 deletions