Mercurial > hg > nginx

diff src/http/modules/ngx_http_gzip_filter_module.c @ 3372:6b8e5c882e47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
support "*" in gzip_types, ssi_types, etc
author Igor Sysoev <igor@sysoev.ru>
date Mon, 30 Nov 2009 13:15:10 +0000
parents d17c4c5c1c57
children 0c517d0cabe0
line wrap: on
line diff
--- a/src/http/modules/ngx_http_gzip_filter_module.c
+++ b/src/http/modules/ngx_http_gzip_filter_module.c
@@ -1123,8 +1123,8 @@ ngx_http_gzip_merge_conf(ngx_conf_t *cf,
                               MAX_MEM_LEVEL - 1);
     ngx_conf_merge_value(conf->min_length, prev->min_length, 20);
 
-    if (ngx_http_merge_types(cf, conf->types_keys, &conf->types,
-                             prev->types_keys, &prev->types,
+    if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types,
+                             &prev->types_keys, &prev->types,
                              ngx_http_html_default_types)
         != NGX_OK)
     {