diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-12-12 23:50:46 +0300 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-12-12 23:50:46 +0300 |
| commit | af1eaa8cddc9dac82e377815c5ef3fed1053322d (patch) | |
| tree | e7030007706fd3d883f1eedba1343e3cc1738f56 /src/http | |
| parent | 15ec67c6d2d1e9179244d1d2d2b3c08c295c8ec2 (diff) | |
r1591 merge:
fix segfault
Diffstat (limited to 'src/http')
| -rw-r--r-- | src/http/modules/ngx_http_charset_filter_module.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_charset_filter_module.c b/src/http/modules/ngx_http_charset_filter_module.c index 8c9fad6f9..f7d9906a8 100644 --- 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_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; |