diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2011-09-05 13:18:16 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2011-09-05 13:18:16 +0000 |
| commit | 3eed28f33fe69379091eb454876d5d9986489dd7 (patch) | |
| tree | 956a0e098a90bfa147ed457a72baa53c77cd8554 /src/event/ngx_event_openssl.c | |
| parent | e18abb42c9acac169b1f9a366a564dd4ac636637 (diff) | |
| download | nginx-3eed28f33fe69379091eb454876d5d9986489dd7.tar.gz | |
Changes with nginx 1.1.2 05 Sep 2011v1.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.
Diffstat (limited to 'src/event/ngx_event_openssl.c')
| -rw-r--r-- | src/event/ngx_event_openssl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/event/ngx_event_openssl.c b/src/event/ngx_event_openssl.c index bb689488a..259b1d8f2 100644 --- a/src/event/ngx_event_openssl.c +++ b/src/event/ngx_event_openssl.c @@ -1205,6 +1205,7 @@ ngx_ssl_shutdown(ngx_connection_t *c) if (c->timedout) { mode = SSL_RECEIVED_SHUTDOWN|SSL_SENT_SHUTDOWN; + SSL_set_quiet_shutdown(c->ssl->connection, 1); } else { mode = SSL_get_shutdown(c->ssl->connection); @@ -1216,6 +1217,10 @@ ngx_ssl_shutdown(ngx_connection_t *c) if (c->ssl->no_send_shutdown) { mode |= SSL_SENT_SHUTDOWN; } + + if (c->ssl->no_wait_shutdown && c->ssl->no_send_shutdown) { + SSL_set_quiet_shutdown(c->ssl->connection, 1); + } } SSL_set_shutdown(c->ssl->connection, mode); |