Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_request.c @ 636:943566b4d82e NGINX_1_1_2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.1.2 *) Change: now if total size of all ranges is greater than source response size, then nginx disables ranges and returns just the source response. *) Feature: the "max_ranges" directive. *) Bugfix: the "ssl_verify_client", "ssl_verify_depth", and "ssl_prefer_server_ciphers" directives might work incorrectly if SNI was used. *) Bugfix: in the "proxy/fastcgi/scgi/uwsgi_ignore_client_abort" directives.
author Igor Sysoev <http://sysoev.ru>
date Mon, 05 Sep 2011 00:00:00 +0400
parents 5b73504dd4ba
children 6f21ae02fb01
comparison
equal deleted inserted replaced
635:5d94f8b3e01d 636:943566b4d82e
671 671
672 sscf = ngx_http_get_module_srv_conf(r, ngx_http_ssl_module); 672 sscf = ngx_http_get_module_srv_conf(r, ngx_http_ssl_module);
673 673
674 SSL_set_SSL_CTX(ssl_conn, sscf->ssl.ctx); 674 SSL_set_SSL_CTX(ssl_conn, sscf->ssl.ctx);
675 675
676 /*
677 * SSL_set_SSL_CTX() only changes certs as of 1.0.0d
678 * adjust other things we care about
679 */
680
681 SSL_set_verify(ssl_conn, SSL_CTX_get_verify_mode(sscf->ssl.ctx),
682 SSL_CTX_get_verify_callback(sscf->ssl.ctx));
683
684 SSL_set_verify_depth(ssl_conn, SSL_CTX_get_verify_depth(sscf->ssl.ctx));
685
686 #ifdef SSL_CTRL_CLEAR_OPTIONS
687 /* only in 0.9.8m+ */
688 SSL_clear_options(ssl_conn, SSL_get_options(ssl_conn) &
689 ~SSL_CTX_get_options(sscf->ssl.ctx));
690 #endif
691
692 SSL_set_options(ssl_conn, SSL_CTX_get_options(sscf->ssl.ctx));
693
676 return SSL_TLSEXT_ERR_OK; 694 return SSL_TLSEXT_ERR_OK;
677 } 695 }
678 696
679 #endif 697 #endif
680 698