summaryrefslogtreecommitdiff
path: root/src/http/ngx_http.h
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-11-30 13:28:18 +0000
committerJonathan Kolb <jon@b0g.us>2009-11-30 13:28:18 +0000
commitb8222dfe13353f4af6b095ec7e62ff4f7fd0e7b3 (patch)
treea4dc5bae9f21865aa918b5967ca56ddb131f060a /src/http/ngx_http.h
parentbbbdf09fbd101b3b88686b228d7e85fee6b706ae (diff)
downloadnginx-b8222dfe13353f4af6b095ec7e62ff4f7fd0e7b3.tar.gz
Changes with nginx 0.8.29 30 Nov 2009v0.8.29
*) Change: now the "009" status code is written to an access log for proxied HTTP/0.9 responses. *) Feature: the "addition_types", "charset_types", "gzip_types", "ssi_types", "sub_filter_types", and "xslt_types" directives support an "*" parameter. *) Feature: GCC 4.1+ built-in atomic operations usage. Thanks to W-Mark Kubacki. *) Feature: the --with-libatomic[=DIR] option in the configure. Thanks to W-Mark Kubacki. *) Bugfix: listen unix domain socket had limited access rights. *) Bugfix: cached HTTP/0.9 responses were handled incorrectly. *) Bugfix: regular expression named captures given by "?P<...>" did not work in a "server_name" directive. Thanks to Maxim Dounin.
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);