Mercurial > hg > nginx
comparison src/http/ngx_http_request.c @ 7956:ae70fcb8ac93 stable-1.20
Fixed SSL logging with lingering close.
Recent fixes to SSL shutdown with lingering close (554c6ae25ffc, 1.19.5)
broke logging of SSL variables. To make sure logging of SSL variables
works properly, avoid freeing c->ssl when doing an SSL shutdown before
lingering close.
Reported by Reinis Rozitis
(http://mailman.nginx.org/pipermail/nginx/2021-May/060670.html).
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Tue, 01 Jun 2021 17:37:51 +0300 |
| parents | 4a9d28f8f39e |
| children |
comparison
equal
deleted
inserted
replaced
| 7955:0601a4e793bf | 7956:ae70fcb8ac93 |
|---|---|
| 3396 | 3396 |
| 3397 #if (NGX_HTTP_SSL) | 3397 #if (NGX_HTTP_SSL) |
| 3398 if (c->ssl) { | 3398 if (c->ssl) { |
| 3399 ngx_int_t rc; | 3399 ngx_int_t rc; |
| 3400 | 3400 |
| 3401 c->ssl->shutdown_without_free = 1; | |
| 3402 | |
| 3401 rc = ngx_ssl_shutdown(c); | 3403 rc = ngx_ssl_shutdown(c); |
| 3402 | 3404 |
| 3403 if (rc == NGX_ERROR) { | 3405 if (rc == NGX_ERROR) { |
| 3404 ngx_http_close_request(r, 0); | 3406 ngx_http_close_request(r, 0); |
| 3405 return; | 3407 return; |