# HG changeset patch
# User Ruslan Ermilov <ru@nginx.com>
# Date 1322043764 0
# Node ID 39982fa694829f4ea0621fb39a9eaa6f1593f673
# Parent  9f418371831e31073e7dc6c574b238649888435e
Fixed "rotate" to always work when combined with "resize/crop".

diff --git a/src/http/modules/ngx_http_image_filter_module.c b/src/http/modules/ngx_http_image_filter_module.c
--- a/src/http/modules/ngx_http_image_filter_module.c
+++ b/src/http/modules/ngx_http_image_filter_module.c
@@ -1262,7 +1262,11 @@ ngx_http_image_filter(ngx_conf_t *cf, ng
     } else if (cf->args->nelts == 3) {
 
         if (ngx_strcmp(value[i].data, "rotate") == 0) {
-            imcf->filter = NGX_HTTP_IMAGE_ROTATE;
+            if (imcf->filter != NGX_HTTP_IMAGE_RESIZE
+                && imcf->filter != NGX_HTTP_IMAGE_CROP)
+            {
+                imcf->filter = NGX_HTTP_IMAGE_ROTATE;
+            }
 
             ngx_memzero(&ccv, sizeof(ngx_http_compile_complex_value_t));