Mercurial > hg > nginx
comparison src/http/modules/ngx_http_gzip_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 | d17c4c5c1c57 |
children | 0c517d0cabe0 |
comparison
equal
deleted
inserted
replaced
3371:102fdc22de4d | 3372:6b8e5c882e47 |
---|---|
1121 ngx_conf_merge_size_value(conf->wbits, prev->wbits, MAX_WBITS); | 1121 ngx_conf_merge_size_value(conf->wbits, prev->wbits, MAX_WBITS); |
1122 ngx_conf_merge_size_value(conf->memlevel, prev->memlevel, | 1122 ngx_conf_merge_size_value(conf->memlevel, prev->memlevel, |
1123 MAX_MEM_LEVEL - 1); | 1123 MAX_MEM_LEVEL - 1); |
1124 ngx_conf_merge_value(conf->min_length, prev->min_length, 20); | 1124 ngx_conf_merge_value(conf->min_length, prev->min_length, 20); |
1125 | 1125 |
1126 if (ngx_http_merge_types(cf, conf->types_keys, &conf->types, | 1126 if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types, |
1127 prev->types_keys, &prev->types, | 1127 &prev->types_keys, &prev->types, |
1128 ngx_http_html_default_types) | 1128 ngx_http_html_default_types) |
1129 != NGX_OK) | 1129 != NGX_OK) |
1130 { | 1130 { |
1131 return NGX_CONF_ERROR; | 1131 return NGX_CONF_ERROR; |
1132 } | 1132 } |