comparison src/stream/ngx_stream_proxy_module.c @ 7156:9c29644f6d03

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.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 20 Nov 2017 16:31:07 +0300
parents 0846dd76a487
children 84e53e4735a4
comparison
equal deleted inserted replaced
7155:29e9571b1989 7156:9c29644f6d03
1288 1288
1289 c = ev->data; 1289 c = ev->data;
1290 s = c->data; 1290 s = c->data;
1291 u = s->upstream; 1291 u = s->upstream;
1292 1292
1293 if (c->close) {
1294 ngx_log_error(NGX_LOG_INFO, c->log, 0, "shutdown timeout");
1295 ngx_stream_proxy_finalize(s, NGX_STREAM_OK);
1296 return;
1297 }
1298
1293 c = s->connection; 1299 c = s->connection;
1294 pc = u->peer.connection; 1300 pc = u->peer.connection;
1295 1301
1296 pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module); 1302 pscf = ngx_stream_get_module_srv_conf(s, ngx_stream_proxy_module);
1297 1303