IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2024-12-22 15:13:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Proxy: do not create conf->headers_source when not needed.

Browse Source
This commit is contained in:
Maxim Dounin 2016-10-14 19:48:26 +03:00
parent c541cf70cf
commit 97fc4ab790
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3392,14 +3392,6 @@ ngx_http_proxy_init_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
return NGX_ERROR; return NGX_ERROR;
} }
if (conf->headers_source == NULL) {
conf->headers_source = ngx_array_create(cf->pool, 4,
sizeof(ngx_keyval_t));
if (conf->headers_source == NULL) {
return NGX_ERROR;
}
}
headers->lengths = ngx_array_create(cf->pool, 64, 1); headers->lengths = ngx_array_create(cf->pool, 64, 1);
if (headers->lengths == NULL) { if (headers->lengths == NULL) {
return NGX_ERROR; return NGX_ERROR;
@ -3410,15 +3402,18 @@ ngx_http_proxy_init_headers(ngx_conf_t *cf, ngx_http_proxy_loc_conf_t *conf,
return NGX_ERROR; return NGX_ERROR;
} }
src = conf->headers_source->elts; if (conf->headers_source) {
for (i = 0; i < conf->headers_source->nelts; i++) {
s = ngx_array_push(&headers_merged); src = conf->headers_source->elts;
if (s == NULL) { for (i = 0; i < conf->headers_source->nelts; i++) {
return NGX_ERROR;
s = ngx_array_push(&headers_merged);
if (s == NULL) {
return NGX_ERROR;
}
*s = src[i];
} }
*s = src[i];
} }
h = default_headers; h = default_headers;