Mercurial > hg > nginx
comparison src/http/ngx_http_request.c @ 7871:5f765427c17a
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 | 1336a33cff33 |
| children | b290610bf812 |
comparison
equal
deleted
inserted
replaced
| 7870:fecf645ff2f8 | 7871:5f765427c17a |
|---|---|
| 3398 | 3398 |
| 3399 #if (NGX_HTTP_SSL) | 3399 #if (NGX_HTTP_SSL) |
| 3400 if (c->ssl) { | 3400 if (c->ssl) { |
| 3401 ngx_int_t rc; | 3401 ngx_int_t rc; |
| 3402 | 3402 |
| 3403 c->ssl->shutdown_without_free = 1; | |
| 3404 | |
| 3403 rc = ngx_ssl_shutdown(c); | 3405 rc = ngx_ssl_shutdown(c); |
| 3404 | 3406 |
| 3405 if (rc == NGX_ERROR) { | 3407 if (rc == NGX_ERROR) { |
| 3406 ngx_http_close_request(r, 0); | 3408 ngx_http_close_request(r, 0); |
| 3407 return; | 3409 return; |