Mercurial > hg > nginx
comparison src/mail/ngx_mail_ssl_module.c @ 2102:ef3f8a5bd143 stable-0.6
r2033 merge:
ssl_session_cache none
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 07 Jul 2008 11:28:48 +0000 |
parents | 14510c3cc6cb |
children | f45cec1cd270 |
comparison
equal
deleted
inserted
replaced
2101:c80aa2bf4f4b | 2102:ef3f8a5bd143 |
---|---|
259 if (ngx_ssl_generate_rsa512_key(&conf->ssl) != NGX_OK) { | 259 if (ngx_ssl_generate_rsa512_key(&conf->ssl) != NGX_OK) { |
260 return NGX_CONF_ERROR; | 260 return NGX_CONF_ERROR; |
261 } | 261 } |
262 | 262 |
263 ngx_conf_merge_value(conf->builtin_session_cache, | 263 ngx_conf_merge_value(conf->builtin_session_cache, |
264 prev->builtin_session_cache, NGX_SSL_NO_SCACHE); | 264 prev->builtin_session_cache, NGX_SSL_NONE_SCACHE); |
265 | 265 |
266 if (conf->shm_zone == NULL) { | 266 if (conf->shm_zone == NULL) { |
267 conf->shm_zone = prev->shm_zone; | 267 conf->shm_zone = prev->shm_zone; |
268 } | 268 } |
269 | 269 |
293 | 293 |
294 for (i = 1; i < cf->args->nelts; i++) { | 294 for (i = 1; i < cf->args->nelts; i++) { |
295 | 295 |
296 if (ngx_strcmp(value[i].data, "off") == 0) { | 296 if (ngx_strcmp(value[i].data, "off") == 0) { |
297 scf->builtin_session_cache = NGX_SSL_NO_SCACHE; | 297 scf->builtin_session_cache = NGX_SSL_NO_SCACHE; |
298 continue; | |
299 } | |
300 | |
301 if (ngx_strcmp(value[i].data, "none") == 0) { | |
302 scf->builtin_session_cache = NGX_SSL_NONE_SCACHE; | |
298 continue; | 303 continue; |
299 } | 304 } |
300 | 305 |
301 if (ngx_strcmp(value[i].data, "builtin") == 0) { | 306 if (ngx_strcmp(value[i].data, "builtin") == 0) { |
302 scf->builtin_session_cache = NGX_SSL_DFLT_BUILTIN_SCACHE; | 307 scf->builtin_session_cache = NGX_SSL_DFLT_BUILTIN_SCACHE; |