Mercurial > hg > nginx-mail
comparison src/http/modules/ngx_http_charset_filter_module.c @ 665:0b460e61bdcd default tip
Merge with nginx 1.0.0.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 Apr 2011 04:22:17 +0400 |
parents | 5c576ea5dbd9 |
children |
comparison
equal
deleted
inserted
replaced
572:06419a2298a9 | 665:0b460e61bdcd |
---|---|
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 } |