Mercurial > hg > nginx

comparison src/http/modules/ngx_http_charset_filter_module.c @ 2175:a69886fc2864

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*) fix segfaults in types hash *) fix inheritance: default hash instead of inherited one
author Igor Sysoev <igor@sysoev.ru>
date Wed, 13 Aug 2008 16:25:48 +0000
parents 2cdefc40cabd
children 8caf97ecb136
comparison
equal deleted inserted replaced
2174:20a7fc523aec 2175:a69886fc2864
1482 1482
1483 ngx_uint_t i; 1483 ngx_uint_t i;
1484 ngx_http_charset_recode_t *recode; 1484 ngx_http_charset_recode_t *recode;
1485 ngx_http_charset_main_conf_t *mcf; 1485 ngx_http_charset_main_conf_t *mcf;
1486 1486
1487 if (ngx_http_merge_types(cf, conf->types_keys, &conf->types,
1488 prev->types_keys, &prev->types,
1489 ngx_http_charset_default_types)
1490 != NGX_OK)
1491 {
1492 return NGX_CONF_ERROR;
1493 }
1494
1487 ngx_conf_merge_value(conf->override_charset, prev->override_charset, 0); 1495 ngx_conf_merge_value(conf->override_charset, prev->override_charset, 0);
1488 ngx_conf_merge_value(conf->charset, prev->charset, NGX_HTTP_NO_CHARSET); 1496 ngx_conf_merge_value(conf->charset, prev->charset, NGX_HTTP_NO_CHARSET);
1489 1497
1490 if (conf->source_charset == NGX_CONF_UNSET) { 1498 if (conf->source_charset == NGX_CONF_UNSET) {
1491 conf->source_charset = prev->source_charset; 1499 conf->source_charset = prev->source_charset;
1520 return NGX_CONF_ERROR; 1528 return NGX_CONF_ERROR;
1521 } 1529 }
1522 1530
1523 recode->src = conf->source_charset; 1531 recode->src = conf->source_charset;
1524 recode->dst = conf->charset; 1532 recode->dst = conf->charset;
1525
1526 if (ngx_http_merge_types(cf, conf->types_keys, &conf->types,
1527 prev->types_keys, &prev->types,
1528 ngx_http_charset_default_types)
1529 != NGX_OK)
1530 {
1531 return NGX_CONF_ERROR;
1532 }
1533 1533
1534 return NGX_CONF_OK; 1534 return NGX_CONF_OK;
1535 } 1535 }
1536 1536
1537 1537