Mercurial > hg > nginx-vendor-current

comparison src/http/ngx_http_request.c @ 690:b5b7eea22fda NGINX_1_3_8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.3.8 *) Feature: the "optional_no_ca" parameter of the "ssl_verify_client" directive. Thanks to Mike Kazantsev and Eric O'Connor. *) Feature: the $bytes_sent, $connection, and $connection_requests variables can now be used not only in the "log_format" directive. Thanks to Benjamin Grössing. *) Feature: the "auto" parameter of the "worker_processes" directive. *) Bugfix: "cache file ... has md5 collision" alert. *) Bugfix: in the ngx_http_gunzip_filter_module. *) Bugfix: in the "ssl_stapling" directive.
author Igor Sysoev <http://sysoev.ru>
date Tue, 30 Oct 2012 00:00:00 +0400
parents 5cb5db9975ba
children 6db6e93f55ee
comparison
equal deleted inserted replaced
689:4d942f0d1703 690:b5b7eea22fda
1640 sscf = ngx_http_get_module_srv_conf(r, ngx_http_ssl_module); 1640 sscf = ngx_http_get_module_srv_conf(r, ngx_http_ssl_module);
1641 1641
1642 if (sscf->verify) { 1642 if (sscf->verify) {
1643 rc = SSL_get_verify_result(c->ssl->connection); 1643 rc = SSL_get_verify_result(c->ssl->connection);
1644 1644
1645 if (rc != X509_V_OK) { 1645 if (rc != X509_V_OK
1646 && (sscf->verify != 3 || !ngx_ssl_verify_error_optional(rc)))
1647 {
1646 ngx_log_error(NGX_LOG_INFO, c->log, 0, 1648 ngx_log_error(NGX_LOG_INFO, c->log, 0,
1647 "client SSL certificate verify error: (%l:%s)", 1649 "client SSL certificate verify error: (%l:%s)",
1648 rc, X509_verify_cert_error_string(rc)); 1650 rc, X509_verify_cert_error_string(rc));
1649 1651
1650 ngx_ssl_remove_cached_session(sscf->ssl.ctx, 1652 ngx_ssl_remove_cached_session(sscf->ssl.ctx,
2749 if (n == NGX_AGAIN) { 2751 if (n == NGX_AGAIN) {
2750 if (ngx_handle_read_event(rev, 0) != NGX_OK) { 2752 if (ngx_handle_read_event(rev, 0) != NGX_OK) {
2751 ngx_http_close_connection(c); 2753 ngx_http_close_connection(c);
2752 } 2754 }
2753 2755
2756 /*
2757 * Like ngx_http_set_keepalive() we are trying to not hold
2758 * c->buffer's memory for a keepalive connection.
2759 */
2760
2761 if (ngx_pfree(c->pool, b->start) == NGX_OK) {
2762
2763 /*
2764 * the special note that c->buffer's memory was freed
2765 */
2766
2767 b->pos = NULL;
2768 }
2769
2754 return; 2770 return;
2755 } 2771 }
2756 2772
2757 if (n == NGX_ERROR) { 2773 if (n == NGX_ERROR) {
2758 ngx_http_close_connection(c); 2774 ngx_http_close_connection(c);