r1591 merge:

fix segfault
This commit is contained in:
Igor Sysoev 2007-12-12 20:50:46 +00:00
parent 15ec67c6d2
commit af1eaa8cdd

View File

@ -1462,6 +1462,12 @@ ngx_http_charset_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
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;