comparison src/http/modules/ngx_http_ssl_module.c @ 642:d3cf6c6b0043 NGINX_1_1_5

nginx 1.1.5 *) Feature: the "uwsgi_buffering" and "scgi_buffering" directives. Thanks to Peter Smit. *) Bugfix: non-cacheable responses might be cached if "proxy_cache_bypass" directive was used. Thanks to John Ferlito. *) Bugfix: in HTTP/1.1 support in the ngx_http_proxy_module. *) Bugfix: cached responses with an empty body were returned incorrectly; the bug had appeared in 0.8.31. *) Bugfix: 201 responses of the ngx_http_dav_module were incorrect; the bug had appeared in 0.8.32. *) Bugfix: in the "return" directive. *) Bugfix: the "ssl_session_cache builtin" directive caused segmentation fault; the bug had appeared in 1.1.1.
author Igor Sysoev <http://sysoev.ru>
date Wed, 05 Oct 2011 00:00:00 +0400
parents 23ef0645ea57
children 615b5ea36fc0
comparison
equal deleted inserted replaced
641:6c19b251b926 642:d3cf6c6b0043
614 &ngx_http_ssl_module); 614 &ngx_http_ssl_module);
615 if (sscf->shm_zone == NULL) { 615 if (sscf->shm_zone == NULL) {
616 return NGX_CONF_ERROR; 616 return NGX_CONF_ERROR;
617 } 617 }
618 618
619 sscf->shm_zone->init = ngx_ssl_session_cache_init;
620
619 continue; 621 continue;
620 } 622 }
621 623
622 goto invalid; 624 goto invalid;
623 } 625 }
624 626
625 if (sscf->shm_zone && sscf->builtin_session_cache == NGX_CONF_UNSET) { 627 if (sscf->shm_zone && sscf->builtin_session_cache == NGX_CONF_UNSET) {
626 sscf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE; 628 sscf->builtin_session_cache = NGX_SSL_NO_BUILTIN_SCACHE;
627 } 629 }
628 630
629 sscf->shm_zone->init = ngx_ssl_session_cache_init;
630
631 return NGX_CONF_OK; 631 return NGX_CONF_OK;
632 632
633 invalid: 633 invalid:
634 634
635 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, 635 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,