Mercurial > hg > nginx

comparison src/http/ngx_http.h @ 2175:a69886fc2864

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*) fix segfaults in types hash *) fix inheritance: default hash instead of inherited one
author Igor Sysoev <igor@sysoev.ru>
date Wed, 13 Aug 2008 16:25:48 +0000
parents 723df5089c05
children 8c17cfe63d2c
comparison
equal deleted inserted replaced
2174:20a7fc523aec 2175:a69886fc2864
109 109
110 char *ngx_http_types_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); 110 char *ngx_http_types_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
111 char *ngx_http_merge_types(ngx_conf_t *cf, ngx_array_t *keys, 111 char *ngx_http_merge_types(ngx_conf_t *cf, ngx_array_t *keys,
112 ngx_hash_t *types_hash, ngx_array_t *prev_keys, ngx_hash_t *prev_types_hash, 112 ngx_hash_t *types_hash, ngx_array_t *prev_keys, ngx_hash_t *prev_types_hash,
113 ngx_str_t *default_types); 113 ngx_str_t *default_types);
114 char *ngx_http_set_default_types(ngx_conf_t *cf, ngx_array_t **types, 114 ngx_int_t ngx_http_set_default_types(ngx_conf_t *cf, ngx_array_t **types,
115 ngx_str_t *default_type); 115 ngx_str_t *default_type);
116 116
117 117
118 extern ngx_module_t ngx_http_module; 118 extern ngx_module_t ngx_http_module;
119 119