Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.c @ 6909:5850fed24639
Upstream: read handler cleared on upstream finalization.
With "proxy_ignore_client_abort off" (the default), upstream module changes
r->read_event_handler to ngx_http_upstream_rd_check_broken_connection().
If the handler is not cleared during upstream finalization, it can be
triggered later, causing unexpected effects, if, for example, a request
was redirected to a different location using error_page or X-Accel-Redirect.
In particular, it makes "proxy_ignore_client_abort on" non-working after
a redirection in a configuration like this:
location = / {
error_page 502 = /error;
proxy_pass http://127.0.0.1:8082;
}
location /error {
proxy_pass http://127.0.0.1:8083;
proxy_ignore_client_abort on;
}
It is also known to cause segmentation faults with aio used, see
http://mailman.nginx.org/pipermail/nginx-ru/2015-August/056570.html.
Fix is to explicitly set r->read_event_handler to ngx_http_block_reading()
during upstream finalization, similar to how it is done in the request body
reading code and in the limit_req module.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Fri, 10 Feb 2017 20:24:26 +0300 |
parents | 1aeaae6e9446 |
children | a72886067bbb |
comparison
equal
deleted
inserted
replaced
6908:609daeb3b48b | 6909:5850fed24639 |
---|---|
4364 && u->headers_in.status_n >= NGX_HTTP_SPECIAL_RESPONSE) | 4364 && u->headers_in.status_n >= NGX_HTTP_SPECIAL_RESPONSE) |
4365 { | 4365 { |
4366 u->buffer.last = u->buffer.pos; | 4366 u->buffer.last = u->buffer.pos; |
4367 } | 4367 } |
4368 | 4368 |
4369 r->read_event_handler = ngx_http_block_reading; | |
4370 | |
4369 if (rc == NGX_DECLINED) { | 4371 if (rc == NGX_DECLINED) { |
4370 return; | 4372 return; |
4371 } | 4373 } |
4372 | 4374 |
4373 r->connection->log->action = "sending to client"; | 4375 r->connection->log->action = "sending to client"; |