Skip to content

Commit

Permalink
Upstream: reading from a client after connection upgrade.
Browse files Browse the repository at this point in the history
Read event on a client connection might have been disabled during
previous processing, and we at least need to handle events.  Calling
ngx_http_upstream_process_upgraded() is a simpliest way to do it.

Notably this change is needed for select, poll and /dev/poll event
methods.

Previous version of this patch was posted here:
http://mailman.nginx.org/pipermail/nginx/2014-January/041839.html
  • Loading branch information
mdounin committed Jan 22, 2014
1 parent 096bcd0 commit c74e23b
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions src/http/ngx_http_upstream.c
Original file line number Diff line number Diff line change
Expand Up @@ -2560,11 +2560,7 @@ ngx_http_upstream_upgrade(ngx_http_request_t *r, ngx_http_upstream_t *u)
ngx_http_upstream_process_upgraded(r, 1, 1);
}

if (c->read->ready
|| r->header_in->pos != r->header_in->last)
{
ngx_http_upstream_process_upgraded(r, 0, 1);
}
ngx_http_upstream_process_upgraded(r, 0, 1);
}


Expand Down

0 comments on commit c74e23b

Please sign in to comment.