Mercurial > hg > nginx
comparison src/http/ngx_http_request.c @ 5813:11790b461a6f
SPDY: avoid setting timeout on stream events in ngx_http_writer().
The SPDY module doesn't expect timers can be set on stream events for reasons
other than delaying output. But ngx_http_writer() could add timer on write
event if the delayed flag wasn't set and nginx is waiting for AIO completion.
That could cause delays in sending response over SPDY when file AIO was used.
| author | Valentin Bartenev <vbart@nginx.com> |
|---|---|
| date | Wed, 27 Aug 2014 20:44:11 +0400 |
| parents | e0aa54a4357e |
| children | 21043ce2a005 |
comparison
equal
deleted
inserted
replaced
| 5812:954867a2f0a6 | 5813:11790b461a6f |
|---|---|
| 2654 return; | 2654 return; |
| 2655 } | 2655 } |
| 2656 | 2656 |
| 2657 if (r->buffered || r->postponed || (r == r->main && c->buffered)) { | 2657 if (r->buffered || r->postponed || (r == r->main && c->buffered)) { |
| 2658 | 2658 |
| 2659 #if (NGX_HTTP_SPDY) | |
| 2660 if (r->spdy_stream) { | |
| 2661 return; | |
| 2662 } | |
| 2663 #endif | |
| 2664 | |
| 2659 if (!wev->delayed) { | 2665 if (!wev->delayed) { |
| 2660 ngx_add_timer(wev, clcf->send_timeout); | 2666 ngx_add_timer(wev, clcf->send_timeout); |
| 2661 } | 2667 } |
| 2662 | 2668 |
| 2663 if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) { | 2669 if (ngx_handle_write_event(wev, clcf->send_lowat) != NGX_OK) { |