Mercurial > hg > nginx
comparison src/http/ngx_http_upstream.c @ 5532:17134d29782e
Upstream: reading from a client after connection upgrade.
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
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Wed, 22 Jan 2014 16:05:07 +0400 |
| parents | 6a3ab6fdd70f |
| children | f385349d584b |
comparison
equal
deleted
inserted
replaced
| 5531:97e3769637a7 | 5532:17134d29782e |
|---|---|
| 2558 || u->buffer.pos != u->buffer.last) | 2558 || u->buffer.pos != u->buffer.last) |
| 2559 { | 2559 { |
| 2560 ngx_http_upstream_process_upgraded(r, 1, 1); | 2560 ngx_http_upstream_process_upgraded(r, 1, 1); |
| 2561 } | 2561 } |
| 2562 | 2562 |
| 2563 if (c->read->ready | 2563 ngx_http_upstream_process_upgraded(r, 0, 1); |
| 2564 || r->header_in->pos != r->header_in->last) | |
| 2565 { | |
| 2566 ngx_http_upstream_process_upgraded(r, 0, 1); | |
| 2567 } | |
| 2568 } | 2564 } |
| 2569 | 2565 |
| 2570 | 2566 |
| 2571 static void | 2567 static void |
| 2572 ngx_http_upstream_upgraded_read_downstream(ngx_http_request_t *r) | 2568 ngx_http_upstream_upgraded_read_downstream(ngx_http_request_t *r) |