mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 13:42:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

SSL: fixed SSL shutdown on lingering close.

Browse Source 
Ensure c->recv is properly reset to ngx_recv if SSL_shutdown()
blocks on writing.

The bug had appeared in 554c6ae25ffc.
This commit is contained in:
Ruslan Ermilov 2020-12-08 01:43:36 +03:00
parent cfa669151e
commit e62a5132ca
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/event/ngx_event_openssl.c
View File

@ -2880,6 +2880,7 @@ ngx_ssl_shutdown(ngx_connection_t *c)
SSL_free(c->ssl->connection); SSL_free(c->ssl->connection);
c->ssl = NULL; c->ssl = NULL;
c->recv = ngx_recv;
return NGX_OK; return NGX_OK;
} }
@ -2925,6 +2926,7 @@ ngx_ssl_shutdown(ngx_connection_t *c)
if (n == 1) { if (n == 1) {
SSL_free(c->ssl->connection); SSL_free(c->ssl->connection);
c->ssl = NULL; c->ssl = NULL;
c->recv = ngx_recv;
return NGX_OK; return NGX_OK;
} }
@ -2967,6 +2969,7 @@ ngx_ssl_shutdown(ngx_connection_t *c)
if (sslerr == SSL_ERROR_ZERO_RETURN || ERR_peek_error() == 0) { if (sslerr == SSL_ERROR_ZERO_RETURN || ERR_peek_error() == 0) {
SSL_free(c->ssl->connection); SSL_free(c->ssl->connection);
c->ssl = NULL; c->ssl = NULL;
c->recv = ngx_recv;
return NGX_OK; return NGX_OK;
} }
@ -2977,6 +2980,7 @@ ngx_ssl_shutdown(ngx_connection_t *c)
SSL_free(c->ssl->connection); SSL_free(c->ssl->connection);
c->ssl = NULL; c->ssl = NULL;
c->recv = ngx_recv;
return NGX_ERROR; return NGX_ERROR;
} }

2
src/http/ngx_http_request.c
View File

@ -3397,8 +3397,6 @@ ngx_http_set_lingering_close(ngx_connection_t *c)
c->ssl->handler = ngx_http_set_lingering_close; c->ssl->handler = ngx_http_set_lingering_close;
return; return;
} }
c->recv = ngx_recv;
} }
#endif #endif

2
src/http/v2/ngx_http_v2.c
View File

@ -739,8 +739,6 @@ ngx_http_v2_lingering_close(ngx_connection_t *c)
c->ssl->handler = ngx_http_v2_lingering_close; c->ssl->handler = ngx_http_v2_lingering_close;
return; return;
} }
c->recv = ngx_recv;
} }
#endif #endif