Mercurial > hg > nginx
comparison src/http/modules/ngx_http_sub_filter_module.c @ 3372:6b8e5c882e47
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 | ac33852faaac |
comparison
equal
deleted
inserted
replaced
3371:102fdc22de4d | 3372:6b8e5c882e47 |
---|---|
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 } |