Mercurial > hg > nginx
view auto/include @ 5052:f2dcb25987df stable-1.2
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.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 11 Feb 2013 13:59:08 +0000 |
parents | d620f497c50f |
children | 434548349838 |
line wrap: on
line source
# Copyright (C) Igor Sysoev # Copyright (C) Nginx, Inc. echo $ngx_n "checking for $ngx_include ...$ngx_c" cat << END >> $NGX_AUTOCONF_ERR ---------------------------------------- checking for $ngx_include END ngx_found=no cat << END > $NGX_AUTOTEST.c $NGX_INCLUDE_SYS_PARAM_H #include <$ngx_include> int main() { return 0; } END ngx_test="$CC -o $NGX_AUTOTEST $NGX_AUTOTEST.c" eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" if [ -x $NGX_AUTOTEST ]; then ngx_found=yes echo " found" ngx_name=`echo $ngx_include \ | tr abcdefghijklmnopqrstuvwxyz/. ABCDEFGHIJKLMNOPQRSTUVWXYZ__` have=NGX_HAVE_$ngx_name . auto/have_headers eval "NGX_INCLUDE_$ngx_name='#include <$ngx_include>'" #STUB eval "NGX_$ngx_name='#include <$ngx_include>'" else echo " not found" echo "----------" >> $NGX_AUTOCONF_ERR cat $NGX_AUTOTEST.c >> $NGX_AUTOCONF_ERR echo "----------" >> $NGX_AUTOCONF_ERR echo $ngx_test >> $NGX_AUTOCONF_ERR echo "----------" >> $NGX_AUTOCONF_ERR fi rm $NGX_AUTOTEST*