Mercurial > hg > nginx

diff src/http/modules/ngx_http_addition_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 29ba1de1ab0b
children d620f497c50f
line wrap: on
line diff
--- a/src/http/modules/ngx_http_addition_filter_module.c
+++ b/src/http/modules/ngx_http_addition_filter_module.c
@@ -237,8 +237,8 @@ ngx_http_addition_merge_conf(ngx_conf_t 
     ngx_conf_merge_str_value(conf->before_body, prev->before_body, "");
     ngx_conf_merge_str_value(conf->after_body, prev->after_body, "");
 
-    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)
     {