mirror of
https://github.com/nginx/nginx.git
synced 2024-12-23 15:40:03 -06:00
Fixed worker_shutdown_timeout in various cases.
The ngx_http_upstream_process_upgraded() did not handle c->close request, and upgraded connections do not use the write filter. As a result, worker_shutdown_timeout did not affect upgraded connections (ticket #1419). Fix is to handle c->close in the ngx_http_request_handler() function, thus covering most of the possible cases in http handling. Additionally, mail proxying did not handle neither c->close nor c->error, and thus worker_shutdown_timeout did not work for mail connections. Fix is to add c->close handling to ngx_mail_proxy_handler(). Also, added explicit handling of c->close to stream proxy, ngx_stream_proxy_process_connection(). This improves worker_shutdown_timeout handling in stream, it will no longer wait for some data being transferred in a connection before closing it, and will also provide appropriate logging at the "info" level.
This commit is contained in:
parent
f1c4853ea1
commit
b32cb6b610
@ -2225,6 +2225,13 @@ ngx_http_request_handler(ngx_event_t *ev)
|
|||||||
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
|
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
|
||||||
"http run request: \"%V?%V\"", &r->uri, &r->args);
|
"http run request: \"%V?%V\"", &r->uri, &r->args);
|
||||||
|
|
||||||
|
if (c->close) {
|
||||||
|
r->main->count++;
|
||||||
|
ngx_http_terminate_request(r, 0);
|
||||||
|
ngx_http_run_posted_requests(c);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (ev->delayed && ev->timedout) {
|
if (ev->delayed && ev->timedout) {
|
||||||
ev->delayed = 0;
|
ev->delayed = 0;
|
||||||
ev->timedout = 0;
|
ev->timedout = 0;
|
||||||
|
@ -882,10 +882,13 @@ ngx_mail_proxy_handler(ngx_event_t *ev)
|
|||||||
c = ev->data;
|
c = ev->data;
|
||||||
s = c->data;
|
s = c->data;
|
||||||
|
|
||||||
if (ev->timedout) {
|
if (ev->timedout || c->close) {
|
||||||
c->log->action = "proxying";
|
c->log->action = "proxying";
|
||||||
|
|
||||||
if (c == s->connection) {
|
if (c->close) {
|
||||||
|
ngx_log_error(NGX_LOG_INFO, c->log, 0, "shutdown timeout");
|
||||||
|
|
||||||
|
} else if (c == s->connection) {
|
||||||
ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
|
ngx_log_error(NGX_LOG_INFO, c->log, NGX_ETIMEDOUT,
|
||||||
"client timed out");
|
"client timed out");
|
||||||
c->timedout = 1;
|
c->timedout = 1;
|
||||||
|
@ -1290,6 +1290,12 @@ ngx_stream_proxy_process_connection(ngx_event_t *ev, ngx_uint_t from_upstream)
|
|||||||
s = c->data;
|
s = c->data;
|
||||||
u = s->upstream;
|
u = s->upstream;
|
||||||
|
|
||||||
|
if (c->close) {
|
||||||
|
ngx_log_error(NGX_LOG_INFO, c->log, 0, "shutdown timeout");
|
||||||
|
ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
c = s->connection;
|
c = s->connection;
|
||||||
pc = u->peer.connection;
|
pc = u->peer.connection;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user