mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-20 12:30:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

use local headers_names array instead of stored in configuration

Browse Source 
and allocate its elements from temporary pool
This commit is contained in:
Igor Sysoev 2010-06-03 14:50:59 +00:00
parent a4c6e7889c
commit 17483d5bfb
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/http/modules/ngx_http_proxy_module.c
View File

@ -51,7 +51,6 @@ typedef struct {
ngx_hash_t headers_set_hash; ngx_hash_t headers_set_hash;
ngx_array_t *headers_source; ngx_array_t *headers_source;
ngx_array_t *headers_names;
ngx_array_t *proxy_lengths; ngx_array_t *proxy_lengths;
ngx_array_t *proxy_values; ngx_array_t *proxy_values;
@ -2318,6 +2317,7 @@ ngx_http_proxy_merge_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
size_t size; size_t size;
uintptr_t *code; uintptr_t *code;
ngx_uint_t i; ngx_uint_t i;
ngx_array_t headers_names;
ngx_keyval_t *src, *s, *h; ngx_keyval_t *src, *s, *h;
ngx_hash_key_t *hk; ngx_hash_key_t *hk;
ngx_hash_init_t hash; ngx_hash_init_t hash;
@ -2342,8 +2342,9 @@ ngx_http_proxy_merge_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
} }
conf->headers_names = ngx_array_create(cf->pool, 4, sizeof(ngx_hash_key_t)); if (ngx_array_init(&headers_names, cf->temp_pool, 4, sizeof(ngx_hash_key_t))
if (conf->headers_names == NULL) { != NGX_OK)
{
return NGX_ERROR; return NGX_ERROR;
} }
@ -2404,7 +2405,7 @@ ngx_http_proxy_merge_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
src = conf->headers_source->elts; src = conf->headers_source->elts;
for (i = 0; i < conf->headers_source->nelts; i++) { for (i = 0; i < conf->headers_source->nelts; i++) {
hk = ngx_array_push(conf->headers_names); hk = ngx_array_push(&headers_names);
if (hk == NULL) { if (hk == NULL) {
return NGX_ERROR; return NGX_ERROR;
} }
@ -2552,14 +2553,7 @@ ngx_http_proxy_merge_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
hash.pool = cf->pool; hash.pool = cf->pool;
hash.temp_pool = NULL; hash.temp_pool = NULL;
if (ngx_hash_init(&hash, conf->headers_names->elts, return ngx_hash_init(&hash, headers_names.elts, headers_names.nelts);
conf->headers_names->nelts)
!= NGX_OK)
{
return NGX_ERROR;
}
return NGX_OK;
} }