Mercurial > hg > nginx

comparison src/http/modules/ngx_http_proxy_module.c @ 2865:e8f271979e0a stable-0.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
r2754 merge: merge SSL context inside "if" block
author Igor Sysoev <igor@sysoev.ru>
date Mon, 18 May 2009 16:13:02 +0000
parents 8298d1be0b44
children
comparison
equal deleted inserted replaced
2864:967ad993a4f8 2865:e8f271979e0a
1897 if (prev->proxy_lengths) { 1897 if (prev->proxy_lengths) {
1898 conf->proxy_lengths = prev->proxy_lengths; 1898 conf->proxy_lengths = prev->proxy_lengths;
1899 conf->proxy_values = prev->proxy_values; 1899 conf->proxy_values = prev->proxy_values;
1900 } 1900 }
1901 1901
1902 #if (NGX_HTTP_SSL)
1903 if (conf->upstream.ssl == NULL) {
1904 conf->upstream.ssl = prev->upstream.ssl;
1905 }
1906 #endif
1907
1902 ngx_conf_merge_uint_value(conf->headers_hash_max_size, 1908 ngx_conf_merge_uint_value(conf->headers_hash_max_size,
1903 prev->headers_hash_max_size, 512); 1909 prev->headers_hash_max_size, 512);
1904 1910
1905 ngx_conf_merge_uint_value(conf->headers_hash_bucket_size, 1911 ngx_conf_merge_uint_value(conf->headers_hash_bucket_size,
1906 prev->headers_hash_bucket_size, 64); 1912 prev->headers_hash_bucket_size, 64);