diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-08-13 16:25:48 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-08-13 16:25:48 +0000 |
| commit | c71e3d8f8182b3034f4d7527bdc1748730c5863f (patch) | |
| tree | 28137cf40749b6e9999f64f288728a8e2a95f78e /src/http/ngx_http.h | |
| parent | d1853490daa04fc8ada502ab8649af477ca63c2f (diff) | |
| download | nginx-c71e3d8f8182b3034f4d7527bdc1748730c5863f.tar.gz nginx-c71e3d8f8182b3034f4d7527bdc1748730c5863f.tar.bz2 | |
*) fix segfaults in types hash
*) fix inheritance: default hash instead of inherited one
Diffstat (limited to '')
| -rw-r--r-- | src/http/ngx_http.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http.h b/src/http/ngx_http.h index afbc69de9..762d85c74 100644 --- a/src/http/ngx_http.h +++ b/src/http/ngx_http.h @@ -111,7 +111,7 @@ 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_set_default_types(ngx_conf_t *cf, ngx_array_t **types, +ngx_int_t ngx_http_set_default_types(ngx_conf_t *cf, ngx_array_t **types, ngx_str_t *default_type); |