Mercurial > hg > nginx
comparison src/http/modules/ngx_http_xslt_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 | 204ea173234f |
children | 05e964be70a2 |
comparison
equal
deleted
inserted
replaced
3371:102fdc22de4d | 3372:6b8e5c882e47 |
---|---|
1228 | 1228 |
1229 if (conf->sheets.nelts == 0) { | 1229 if (conf->sheets.nelts == 0) { |
1230 conf->sheets = prev->sheets; | 1230 conf->sheets = prev->sheets; |
1231 } | 1231 } |
1232 | 1232 |
1233 if (ngx_http_merge_types(cf, conf->types_keys, &conf->types, | 1233 if (ngx_http_merge_types(cf, &conf->types_keys, &conf->types, |
1234 prev->types_keys, &prev->types, | 1234 &prev->types_keys, &prev->types, |
1235 ngx_http_xslt_default_types) | 1235 ngx_http_xslt_default_types) |
1236 != NGX_OK) | 1236 != NGX_OK) |
1237 { | 1237 { |
1238 return NGX_CONF_ERROR; | 1238 return NGX_CONF_ERROR; |
1239 } | 1239 } |