Mercurial > hg > nginx

comparison src/http/modules/ngx_http_ssl_module.c @ 2102:ef3f8a5bd143 stable-0.6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
413 if (ngx_ssl_generate_rsa512_key(&conf->ssl) != NGX_OK) { 413 if (ngx_ssl_generate_rsa512_key(&conf->ssl) != NGX_OK) {
414 return NGX_CONF_ERROR; 414 return NGX_CONF_ERROR;
415 } 415 }
416 416
417 ngx_conf_merge_value(conf->builtin_session_cache, 417 ngx_conf_merge_value(conf->builtin_session_cache,
418 prev->builtin_session_cache, NGX_SSL_NO_SCACHE); 418 prev->builtin_session_cache, NGX_SSL_NONE_SCACHE);
419 419
420 if (conf->shm_zone == NULL) { 420 if (conf->shm_zone == NULL) {
421 conf->shm_zone = prev->shm_zone; 421 conf->shm_zone = prev->shm_zone;
422 } 422 }
423 423
447 447
448 for (i = 1; i < cf->args->nelts; i++) { 448 for (i = 1; i < cf->args->nelts; i++) {
449 449
450 if (ngx_strcmp(value[i].data, "off") == 0) { 450 if (ngx_strcmp(value[i].data, "off") == 0) {
451 sscf->builtin_session_cache = NGX_SSL_NO_SCACHE; 451 sscf->builtin_session_cache = NGX_SSL_NO_SCACHE;
452 continue;
453 }
454
455 if (ngx_strcmp(value[i].data, "none") == 0) {
456 sscf->builtin_session_cache = NGX_SSL_NONE_SCACHE;
452 continue; 457 continue;
453 } 458 }
454 459
455 if (ngx_strcmp(value[i].data, "builtin") == 0) { 460 if (ngx_strcmp(value[i].data, "builtin") == 0) {
456 sscf->builtin_session_cache = NGX_SSL_DFLT_BUILTIN_SCACHE; 461 sscf->builtin_session_cache = NGX_SSL_DFLT_BUILTIN_SCACHE;