CERBERUS/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2026-07-01 22:32:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

r2754 merge:

Browse source 
merge SSL context inside "if" block
This commit is contained in:
Igor Sysoev 2009-05-18 16:13:02 +00:00
parent 2d7195bdb7
commit 0e7ed23cec
1 changed files with 6 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/http/modules/ngx_http_proxy_module.c
View file

@ -1899,6 +1899,12 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
conf->proxy_values = prev->proxy_values;
}
#if (NGX_HTTP_SSL)
if (conf->upstream.ssl == NULL) {
conf->upstream.ssl = prev->upstream.ssl;
}
#endif
ngx_conf_merge_uint_value(conf->headers_hash_max_size,
prev->headers_hash_max_size, 512);