diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-07-07 11:28:48 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-07-07 11:28:48 +0000 |
| commit | bcf296e529a8e94655c884a048a5959903b503a0 (patch) | |
| tree | 619749c01b50045a79559893f9ed5aafa6f55593 /src/http/modules | |
| parent | ab5321810493e2d3f371d818f8eecc99b11d4633 (diff) | |
| download | nginx-bcf296e529a8e94655c884a048a5959903b503a0.tar.gz nginx-bcf296e529a8e94655c884a048a5959903b503a0.tar.bz2 | |
r2033 merge:
ssl_session_cache none
Diffstat (limited to 'src/http/modules')
| -rw-r--r-- | src/http/modules/ngx_http_ssl_module.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_ssl_module.c b/src/http/modules/ngx_http_ssl_module.c index 3359900fd..ea9ff8f7e 100644 --- a/src/http/modules/ngx_http_ssl_module.c +++ b/src/http/modules/ngx_http_ssl_module.c @@ -415,7 +415,7 @@ ngx_http_ssl_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child) } ngx_conf_merge_value(conf->builtin_session_cache, - prev->builtin_session_cache, NGX_SSL_NO_SCACHE); + prev->builtin_session_cache, NGX_SSL_NONE_SCACHE); if (conf->shm_zone == NULL) { conf->shm_zone = prev->shm_zone; @@ -452,6 +452,11 @@ ngx_http_ssl_session_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) continue; } + if (ngx_strcmp(value[i].data, "none") == 0) { + sscf->builtin_session_cache = NGX_SSL_NONE_SCACHE; + continue; + } + if (ngx_strcmp(value[i].data, "builtin") == 0) { sscf->builtin_session_cache = NGX_SSL_DFLT_BUILTIN_SCACHE; continue; |