Mercurial > hg > nginx-ranges

comparison src/http/modules/ngx_http_charset_filter_module.c @ 578:f3a9e57d2e17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with current.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 11 Mar 2010 21:27:17 +0300
parents 5c576ea5dbd9
children
comparison
equal deleted inserted replaced
539:5f4de8cf0d9d 578:f3a9e57d2e17
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 }