Mercurial > hg > nginx

comparison src/mail/ngx_mail_ssl_module.c @ 1778:14510c3cc6cb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ssl_session_cache off
author Igor Sysoev <igor@sysoev.ru>
date Wed, 26 Dec 2007 20:27:22 +0000
parents f69493e8faab
children 12b3ad3353f9
comparison
equal deleted inserted replaced
1777:edaea30d83be 1778:14510c3cc6cb
206 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols, 206 ngx_conf_merge_bitmask_value(conf->protocols, prev->protocols,
207 (NGX_CONF_BITMASK_SET 207 (NGX_CONF_BITMASK_SET
208 |NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1)); 208 |NGX_SSL_SSLv2|NGX_SSL_SSLv3|NGX_SSL_TLSv1));
209 209
210 ngx_conf_merge_str_value(conf->certificate, prev->certificate, 210 ngx_conf_merge_str_value(conf->certificate, prev->certificate,
211 NGX_DEFLAUT_CERTIFICATE); 211 NGX_DEFLAUT_CERTIFICATE);
212 212
213 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key, 213 ngx_conf_merge_str_value(conf->certificate_key, prev->certificate_key,
214 NGX_DEFLAUT_CERTIFICATE_KEY); 214 NGX_DEFLAUT_CERTIFICATE_KEY);
215 215
216 ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFLAUT_CIPHERS); 216 ngx_conf_merge_str_value(conf->ciphers, prev->ciphers, NGX_DEFLAUT_CIPHERS);
217 217
218 218
219 conf->ssl.log = cf->log; 219 conf->ssl.log = cf->log;
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, 264 prev->builtin_session_cache, NGX_SSL_NO_SCACHE);
265 NGX_SSL_DFLT_BUILTIN_SCACHE);
266 265
267 if (conf->shm_zone == NULL) { 266 if (conf->shm_zone == NULL) {
268 conf->shm_zone = prev->shm_zone; 267 conf->shm_zone = prev->shm_zone;
269 } 268 }
270 269
291 ngx_uint_t i, j; 290 ngx_uint_t i, j;
292 291
293 value = cf->args->elts; 292 value = cf->args->elts;
294 293
295 for (i = 1; i < cf->args->nelts; i++) { 294 for (i = 1; i < cf->args->nelts; i++) {
295
296 if (ngx_strcmp(value[i].data, "off") == 0) {
297 scf->builtin_session_cache = NGX_SSL_NO_SCACHE;
298 continue;
299 }
296 300
297 if (ngx_strcmp(value[i].data, "builtin") == 0) { 301 if (ngx_strcmp(value[i].data, "builtin") == 0) {
298 scf->builtin_session_cache = NGX_SSL_DFLT_BUILTIN_SCACHE; 302 scf->builtin_session_cache = NGX_SSL_DFLT_BUILTIN_SCACHE;
299 continue; 303 continue;
300 } 304 }