Mercurial > hg > nginx
changeset 3963:10fbb8f02a45
finalizing with rc == 0 in unbuffered proxy mode caused nginx to wait
for another send_timeout before actually closing client's connection
if client timed out while still talking to upstream server
patch by Maxim Dounin
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 22 Jul 2011 13:30:16 +0000 |
parents | df2ae4bc7415 |
children | ff127ba3b091 |
files | src/http/ngx_http_upstream.c |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c Fri Jul 22 12:53:04 2011 +0000 +++ b/src/http/ngx_http_upstream.c Fri Jul 22 13:30:16 2011 +0000 @@ -2317,7 +2317,7 @@ if (wev->timedout) { c->timedout = 1; ngx_connection_error(c, NGX_ETIMEDOUT, "client timed out"); - ngx_http_upstream_finalize_request(r, u, 0); + ngx_http_upstream_finalize_request(r, u, NGX_HTTP_REQUEST_TIME_OUT); return; } @@ -3013,6 +3013,7 @@ #endif if (u->header_sent + && rc != NGX_HTTP_REQUEST_TIME_OUT && (rc == NGX_ERROR || rc >= NGX_HTTP_SPECIAL_RESPONSE)) { rc = 0;