Mercurial > hg > nginx
comparison src/http/modules/ngx_http_ssi_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 | 42c16d8bddbe |
children | 7b68809fe8b1 |
comparison
equal
deleted
inserted
replaced
3371:102fdc22de4d | 3372:6b8e5c882e47 |
---|---|
2771 prev->ignore_recycled_buffers, 0); | 2771 prev->ignore_recycled_buffers, 0); |
2772 | 2772 |
2773 ngx_conf_merge_size_value(conf->min_file_chunk, prev->min_file_chunk, 1024); | 2773 ngx_conf_merge_size_value(conf->min_file_chunk, prev->min_file_chunk, 1024); |
2774 ngx_conf_merge_size_value(conf->value_len, prev->value_len, 256); | 2774 ngx_conf_merge_size_value(conf->value_len, prev->value_len, 256); |
2775 | 2775 |
2776 if (ngx_http_merge_types(cf, conf->types_keys, &conf->types, | 2776 if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types, |
2777 prev->types_keys, &prev->types, | 2777 &prev->types_keys, &prev->types, |
2778 ngx_http_html_default_types) | 2778 ngx_http_html_default_types) |
2779 != NGX_OK) | 2779 != NGX_OK) |
2780 { | 2780 { |
2781 return NGX_CONF_ERROR; | 2781 return NGX_CONF_ERROR; |
2782 } | 2782 } |