Mercurial > hg > nginx
diff src/http/modules/ngx_http_proxy_module.c @ 2184:274c0f3ea600
proxy_ssl_session_reuse
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sun, 17 Aug 2008 17:47:52 +0000 |
parents | 8c6521eedf84 |
children | 8e5bf1bc87e2 |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_proxy_module.c Sun Aug 17 17:44:08 2008 +0000 +++ b/src/http/modules/ngx_http_proxy_module.c Sun Aug 17 17:47:52 2008 +0000 @@ -360,6 +360,17 @@ offsetof(ngx_http_proxy_loc_conf_t, upstream.hide_headers), NULL }, +#if (NGX_HTTP_SSL) + + { ngx_string("proxy_ssl_session_reuse"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_FLAG, + ngx_conf_set_flag_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_proxy_loc_conf_t, upstream.ssl_session_reuse), + NULL }, + +#endif + ngx_null_command }; @@ -1645,6 +1656,9 @@ conf->upstream.pass_headers = NGX_CONF_UNSET_PTR; conf->upstream.intercept_errors = NGX_CONF_UNSET; +#if (NGX_HTTP_SSL) + conf->upstream.ssl_session_reuse = NGX_CONF_UNSET; +#endif /* "proxy_cyclic_temp_file" is disabled */ conf->upstream.cyclic_temp_file = 0; @@ -1834,6 +1848,11 @@ ngx_conf_merge_value(conf->upstream.intercept_errors, prev->upstream.intercept_errors, 0); +#if (NGX_HTTP_SSL) + ngx_conf_merge_value(conf->upstream.ssl_session_reuse, + prev->upstream.ssl_session_reuse, 1); +#endif + ngx_conf_merge_value(conf->redirect, prev->redirect, 1); if (conf->redirect) {