Mercurial > hg > nginx-ranges

comparison src/http/modules/ngx_http_sub_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 c456a023113c
comparison
equal deleted inserted replaced
539:5f4de8cf0d9d 578:f3a9e57d2e17
669 669
670 if (conf->value.value.len == 0) { 670 if (conf->value.value.len == 0) {
671 conf->value = prev->value; 671 conf->value = prev->value;
672 } 672 }
673 673
674 if (ngx_http_merge_types(cf, conf->types_keys, &conf->types, 674 if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types,
675 prev->types_keys, &prev->types, 675 &prev->types_keys, &prev->types,
676 ngx_http_html_default_types) 676 ngx_http_html_default_types)
677 != NGX_OK) 677 != NGX_OK)
678 { 678 {
679 return NGX_CONF_ERROR; 679 return NGX_CONF_ERROR;
680 } 680 }