Mercurial > hg > nginx-vendor-current

comparison src/mail/ngx_mail_ssl_module.c @ 378:820f6378fc00 NGINX_0_7_1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.7.1 *) Change: now locations are searched in a tree. *) Change: the "optimize_server_names" directive was canceled due to the "server_name_in_redirect" directive introduction. *) Change: some long deprecated directives are not supported anymore. *) Change: the "none" parameter in the "ssl_session_cache" directive; now this is default parameter. Thanks to Rob Mueller. *) Bugfix: worker processes might not catch reconfiguration and log rotation signals. *) Bugfix: nginx could not be built on latest Fedora 9 Linux. Thanks to Roxis.
author Igor Sysoev <http://sysoev.ru>
date Mon, 26 May 2008 00:00:00 +0400
parents 9121a0a91f47
children bc21d9cd9c54
comparison
equal deleted inserted replaced
377:5d98007adb5f 378:820f6378fc00
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;