Mercurial > hg > nginx

changeset 1590:8f8e0a60685f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix segfault
author Igor Sysoev <igor@sysoev.ru>
date Mon, 22 Oct 2007 10:15:27 +0000
parents 4705b76bb08b
children 135202406b0c
files src/http/modules/ngx_http_charset_filter_module.c
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_charset_filter_module.c
+++ b/src/http/modules/ngx_http_charset_filter_module.c
@@ -1462,6 +1462,12 @@ ngx_http_charset_merge_loc_conf(ngx_conf
         return NGX_CONF_OK;
     }
 
+    if (conf->source_charset >= NGX_HTTP_CHARSET_VAR
+        || conf->charset >= NGX_HTTP_CHARSET_VAR)
+    {
+        return NGX_CONF_OK;
+    }
+
     mcf = ngx_http_conf_get_module_main_conf(cf,
                                              ngx_http_charset_filter_module);
     recode = mcf->recodes.elts;