diff options
author | Igor Sysoev <igor@sysoev.ru> | 2008-08-13 20:25:48 +0400 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2008-08-13 20:25:48 +0400 |
commit | c71e3d8f8182b3034f4d7527bdc1748730c5863f (patch) | |
tree | 28137cf40749b6e9999f64f288728a8e2a95f78e /src/http/ngx_http.c | |
parent | d1853490daa04fc8ada502ab8649af477ca63c2f (diff) |
*) fix segfaults in types hash
*) fix inheritance: default hash instead of inherited one
Diffstat (limited to 'src/http/ngx_http.c')
-rw-r--r-- | src/http/ngx_http.c | 61 |
1 files changed, 39 insertions, 22 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 024170f45..9a826b011 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1761,43 +1761,60 @@ 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_array_t *prev_keys, ngx_hash_t *prev_types_hash, ngx_str_t *default_types) { ngx_hash_init_t hash; - if (keys == NULL) { + if (keys) { - if (prev_keys) { - *types_hash = *prev_types_hash; - return NGX_CONF_OK; - } + hash.hash = types_hash; + hash.key = NULL; + hash.max_size = 2048; + hash.bucket_size = 64; + hash.name = "test_types_hash"; + hash.pool = cf->pool; + hash.temp_pool = NULL; - if (ngx_http_set_default_types(cf, &keys, default_types) - != NGX_CONF_OK) - { + if (ngx_hash_init(&hash, keys->elts, keys->nelts) != NGX_OK) { return NGX_CONF_ERROR; } + + return NGX_CONF_OK; } - hash.hash = types_hash; - hash.key = NULL; - hash.max_size = 2048; - hash.bucket_size = 64; - hash.name = "test_types_hash"; - hash.pool = cf->pool; - hash.temp_pool = NULL; + if (prev_types_hash->buckets == NULL) { - if (ngx_hash_init(&hash, keys->elts, keys->nelts) != NGX_OK) { - return NGX_CONF_ERROR; + if (prev_keys == NULL) { + + if (ngx_http_set_default_types(cf, &prev_keys, default_types) + != NGX_OK) + { + return NGX_CONF_ERROR; + } + } + + hash.hash = prev_types_hash; + hash.key = NULL; + hash.max_size = 2048; + hash.bucket_size = 64; + hash.name = "test_types_hash"; + hash.pool = cf->pool; + hash.temp_pool = NULL; + + if (ngx_hash_init(&hash, prev_keys->elts, prev_keys->nelts) != NGX_OK) { + return NGX_CONF_ERROR; + } } + *types_hash = *prev_types_hash; + return NGX_CONF_OK; } -char * +ngx_int_t ngx_http_set_default_types(ngx_conf_t *cf, ngx_array_t **types, ngx_str_t *default_type) { @@ -1805,14 +1822,14 @@ ngx_http_set_default_types(ngx_conf_t *cf, ngx_array_t **types, *types = ngx_array_create(cf->temp_pool, 1, sizeof(ngx_hash_key_t)); if (*types == NULL) { - return NGX_CONF_ERROR; + return NGX_ERROR; } while (default_type->len) { type = ngx_array_push(*types); if (type == NULL) { - return NGX_CONF_ERROR; + return NGX_ERROR; } type->key = *default_type; @@ -1823,5 +1840,5 @@ ngx_http_set_default_types(ngx_conf_t *cf, ngx_array_t **types, default_type++; } - return NGX_CONF_OK; + return NGX_OK; } |