<div style="line-height:1.7;color:#000000;font-size:14px;font-family:arial"><div><span style="line-height: 1.7;"># HG changeset patch</span></div><div># User FengGu <flygoast@126.com></div><div># Date 1403694825 -28800</div><div>#      Wed Jun 25 19:13:45 2014 +0800</div><div># Node ID 12fd8ef2f6ea3167dd96cb000aafeb2665aeee14</div><div># Parent  63d7d69d0fe48e030ff9fc520c7036dbd1ebc13f</div><div>Upstream: fix possible request hang when "proxy_buffering" is off.</div><div><br></div><div>In ngx_http_upstream_process_non_buffered_request(), when processing non</div><div>buffered request, if write event has been delayed, deleting write timer</div><div>event is likely to result in follow-up writing buffered in</div><div>ngx_http_write_filter() ever since.</div><div><br></div><div>diff -r 63d7d69d0fe4 -r 12fd8ef2f6ea src/http/ngx_http_upstream.c</div><div>--- a/src/http/ngx_http_upstream.c  Fri Jun 20 12:55:41 2014 +0400</div><div>+++ b/src/http/ngx_http_upstream.c  Wed Jun 25 19:13:45 2014 +0800</div><div>@@ -3058,6 +3058,7 @@</div><div>         ngx_add_timer(downstream->write, clcf->send_timeout);</div><div><br></div><div>     } else if (downstream->write->timer_set) {</div><div>+        downstream->write->delayed = 0;</div><div>         ngx_del_timer(downstream->write);</div><div>     }</div><div><br></div></div><br><br><span title="neteasefooter"><span id="netease_mail_footer"></span></span>