aboutsummaryrefslogtreecommitdiff
path: root/src/http/ngx_http.h
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-11-30 13:15:10 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-11-30 13:15:10 +0000
commit1cfb972e74c6d61b9cddb729efd130eb71fd66ef (patch)
tree7aa1bf4f2224a66336d1b6d98bf7217794d113ad /src/http/ngx_http.h
parenta734e33720c255a4159257014e58df2ed1578acb (diff)
downloadnginx-1cfb972e74c6d61b9cddb729efd130eb71fd66ef.tar.gz
nginx-1cfb972e74c6d61b9cddb729efd130eb71fd66ef.zip
support "*" in gzip_types, ssi_types, etc
Diffstat (limited to 'src/http/ngx_http.h')
-rw-r--r--src/http/ngx_http.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h
index 08bea5964..b717c8032 100644
--- a/src/http/ngx_http.h
+++ b/src/http/ngx_http.h
@@ -126,9 +126,9 @@ void ngx_http_test_reading(ngx_http_request_t *r);
char *ngx_http_types_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
-char *ngx_http_merge_types(ngx_conf_t *cf, ngx_array_t *keys,
- ngx_hash_t *types_hash, ngx_array_t *prev_keys, ngx_hash_t *prev_types_hash,
- ngx_str_t *default_types);
+char *ngx_http_merge_types(ngx_conf_t *cf, ngx_array_t **keys,
+ ngx_hash_t *types_hash, ngx_array_t **prev_keys,
+ ngx_hash_t *prev_types_hash, ngx_str_t *default_types);
ngx_int_t ngx_http_set_default_types(ngx_conf_t *cf, ngx_array_t **types,
ngx_str_t *default_type);