mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-26 07:06:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

r1591 merge:

Browse Source 
fix segfault
This commit is contained in:
Igor Sysoev 2007-12-12 20:50:46 +00:00
parent 15ec67c6d2
commit af1eaa8cdd
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/http/modules/ngx_http_charset_filter_module.c
View File

@ -1462,6 +1462,12 @@ ngx_http_charset_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
return NGX_CONF_OK; 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, mcf = ngx_http_conf_get_module_main_conf(cf,
ngx_http_charset_filter_module); ngx_http_charset_filter_module);
recode = mcf->recodes.elts; recode = mcf->recodes.elts;