Mercurial > hg > nginx
view auto/lib/google-perftools/conf @ 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 | 47936d1c98e9 |
children | 0e1491139947 |
line wrap: on
line source
# Copyright (C) Igor Sysoev # Copyright (C) Nginx, Inc. ngx_feature="Google perftools" ngx_feature_name= ngx_feature_run=no ngx_feature_incs= ngx_feature_path= ngx_feature_libs="-lprofiler" ngx_feature_test="ProfilerStop()" . auto/feature if [ $ngx_found = no ]; then # FreeBSD port ngx_feature="Google perftools in /usr/local/" if [ $NGX_RPATH = YES ]; then ngx_feature_libs="-R/usr/local/lib -L/usr/local/lib -lprofiler" else ngx_feature_libs="-L/usr/local/lib -lprofiler" fi . auto/feature fi if [ $ngx_found = no ]; then # MacPorts ngx_feature="Google perftools in /opt/local/" if [ $NGX_RPATH = YES ]; then ngx_feature_libs="-R/opt/local/lib -L/opt/local/lib -lprofiler" else ngx_feature_libs="-L/opt/local/lib -lprofiler" fi . auto/feature fi if [ $ngx_found = yes ]; then CORE_LIBS="$CORE_LIBS $ngx_feature_libs" else cat << END $0: error: the Google perftool module requires the Google perftools library. You can either do not enable the module or install the library. END exit 1 fi