Mercurial > hg > nginx
changeset 1724:461d00e8a2a9 stable-0.5
r1591 merge:
fix segfault
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Wed, 12 Dec 2007 20:50:46 +0000 |
| parents | 9b047c9e96c1 |
| children | 0a174d921f1e |
| 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;