details: http://hg.nginx.org/nginx/rev/0ae9a2958886
branches:
changeset: 5297:0ae9a2958886
user: Maxim Dounin <mdounin@mdounin.ru>
date: Thu Jul 25 14:56:41 2013 +0400
description:
Upstream: NGX_ERROR after pipe errors.

diffstat:

src/http/ngx_http_upstream.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)

diffs (39 lines):

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2904,7 +2904,7 @@ ngx_http_upstream_process_downstream(ngx
}

if (ngx_event_pipe(p, wev->write) == NGX_ABORT) {
- ngx_http_upstream_finalize_request(r, u, 0);
+ ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
return;
}

@@ -2929,7 +2929,7 @@ ngx_http_upstream_process_downstream(ngx
}

if (ngx_event_pipe(p, 1) == NGX_ABORT) {
- ngx_http_upstream_finalize_request(r, u, 0);
+ ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
return;
}
}
@@ -2957,7 +2957,7 @@ ngx_http_upstream_process_upstream(ngx_h

} else {
if (ngx_event_pipe(u->pipe, 0) == NGX_ABORT) {
- ngx_http_upstream_finalize_request(r, u, 0);
+ ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
return;
}
}
@@ -3035,7 +3035,7 @@ ngx_http_upstream_process_request(ngx_ht
"http upstream downstream error");

if (!u->cacheable && !u->store && u->peer.connection) {
- ngx_http_upstream_finalize_request(r, u, 0);
+ ngx_http_upstream_finalize_request(r, u, NGX_ERROR);
}
}
}

_______________________________________________
nginx-devel mailing list
nginx-devel@nginx.org
http://mailman.nginx.org/mailman/listinfo/nginx-devel