Mercurial > hg > nginx

comparison src/http/modules/ngx_http_charset_filter_module.c @ 3372:6b8e5c882e47

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
support "*" in gzip_types, ssi_types, etc
author Igor Sysoev <igor@sysoev.ru>
date Mon, 30 Nov 2009 13:15:10 +0000
parents c7d57b539248
children d620f497c50f
comparison
equal deleted inserted replaced
3371:102fdc22de4d 3372:6b8e5c882e47
1548 1548
1549 ngx_uint_t i; 1549 ngx_uint_t i;
1550 ngx_http_charset_recode_t *recode; 1550 ngx_http_charset_recode_t *recode;
1551 ngx_http_charset_main_conf_t *mcf; 1551 ngx_http_charset_main_conf_t *mcf;
1552 1552
1553 if (ngx_http_merge_types(cf, conf->types_keys, &conf->types, 1553 if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types,
1554 prev->types_keys, &prev->types, 1554 &prev->types_keys, &prev->types,
1555 ngx_http_charset_default_types) 1555 ngx_http_charset_default_types)
1556 != NGX_OK) 1556 != NGX_OK)
1557 { 1557 {
1558 return NGX_CONF_ERROR; 1558 return NGX_CONF_ERROR;
1559 } 1559 }