]> git.kaiwu.me - nginx.git/commit
Merge of r4979, r4982: image filter configuration inheritance.
authorMaxim Dounin <mdounin@mdounin.ru>
Mon, 11 Feb 2013 13:59:08 +0000 (13:59 +0000)
committerMaxim Dounin <mdounin@mdounin.ru>
Mon, 11 Feb 2013 13:59:08 +0000 (13:59 +0000)
commit8fea19793236c9a21ac13599aafb3cec746640fd
treea5717021c798dccd5681fbc70efe0cfe0dbc80fc
parentfba705e4f54d608db58e456bc52b4c9cdd1d9e88
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.
src/http/modules/ngx_http_image_filter_module.c