diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-07-25 14:56:41 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-07-25 14:56:41 +0400 |
| commit | e6122efbfe50fbd7724a940f4433948c2612a397 (patch) | |
| tree | 00686ef45f741904ca55524950bbe2bb932ac63b /src | |
| parent | 8536fb79ca9801aed16c9d5fd6ddf7d25bfa1603 (diff) | |
| download | nginx-e6122efbfe50fbd7724a940f4433948c2612a397.tar.gz nginx-e6122efbfe50fbd7724a940f4433948c2612a397.zip | |
Upstream: NGX_ERROR after pipe errors.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 1ecc9be14..32455bcd9 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -2904,7 +2904,7 @@ ngx_http_upstream_process_downstream(ngx_http_request_t *r) } 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_http_request_t *r) } 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_http_request_t *r, } 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_http_request_t *r) "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); } } } |