summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-06-15 09:05:31 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-06-15 09:05:31 +0000
commit2374ad792c1bf5c90ed90151dfee8d52408382b9 (patch)
tree45e19b7c88d3402d6216916971e5a46d68884bff
parent9371a7a493de284d94ce94e1a6147f6fc9e3d393 (diff)
downloadnginx-2374ad792c1bf5c90ed90151dfee8d52408382b9.tar.gz
nginx-2374ad792c1bf5c90ed90151dfee8d52408382b9.tar.bz2
merge r2919:
test GIF87a
-rw-r--r--src/http/modules/ngx_http_image_filter_module.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/http/modules/ngx_http_image_filter_module.c b/src/http/modules/ngx_http_image_filter_module.c
index 293a61fc3..c1c335a04 100644
--- a/src/http/modules/ngx_http_image_filter_module.c
+++ b/src/http/modules/ngx_http_image_filter_module.c
@@ -383,11 +383,12 @@ ngx_http_image_test(ngx_http_request_t *r, ngx_chain_t *in)
return NGX_HTTP_IMAGE_JPEG;
} else if (p[0] == 'G' && p[1] == 'I' && p[2] == 'F' && p[3] == '8'
- && p[4] == '9' && p[5] == 'a')
+ && p[5] == 'a')
{
- /* GIF */
-
- return NGX_HTTP_IMAGE_GIF;
+ if (p[4] == '9' || p[4] == '7') {
+ /* GIF */
+ return NGX_HTTP_IMAGE_GIF;
+ }
} else if (p[0] == 0x89 && p[1] == 'P' && p[2] == 'N' && p[3] == 'G'
&& p[4] == 0x0d && p[5] == 0x0a && p[6] == 0x1a && p[7] == 0x0a)