Mercurial > hg > nginx
changeset 5579:7586e7b2dbe9
Upstream: ngx_post_event() instead of upgraded call (ticket #503).
If a request is finalized in the first call to the
ngx_http_upstream_process_upgraded() function, e.g., because upstream
server closed the connection for some reason, in the second call
the u->peer.connection pointer will be null, resulting in segmentation
fault.
Fix is to avoid second direct call, and post event instead. This ensures
that ngx_http_upstream_process_upgraded() won't be called again if
a request is finalized.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Tue, 18 Feb 2014 17:30:40 +0400 |
parents | e280ece17020 |
children | 06c227e9edd0 |
files | src/http/ngx_http_upstream.c |
diffstat | 1 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c Fri Feb 14 15:14:48 2014 +0400 +++ b/src/http/ngx_http_upstream.c Tue Feb 18 17:30:40 2014 +0400 @@ -2557,7 +2557,9 @@ if (u->peer.connection->read->ready || u->buffer.pos != u->buffer.last) { + ngx_post_event(c->read, &ngx_posted_events); ngx_http_upstream_process_upgraded(r, 1, 1); + return; } ngx_http_upstream_process_upgraded(r, 0, 1);