diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-07-25 14:56:00 +0400 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-07-25 14:56:00 +0400 |
| commit | 76e15717491d6d4b227d715f3a80ae8859e30b5a (patch) | |
| tree | 529bf9a028eb40c36f932ff6443c1602912fe1af /src | |
| parent | 9f925b8c777ba8ff3b852edddfe9be1b2a324cfd (diff) | |
| download | nginx-76e15717491d6d4b227d715f3a80ae8859e30b5a.tar.gz nginx-76e15717491d6d4b227d715f3a80ae8859e30b5a.zip | |
Upstream: consistent error handling after u->input_filter_init().
In all cases ngx_http_upstream_finalize_request() with NGX_ERROR now used.
Previously used NGX_HTTP_INTERNAL_SERVER_ERROR in the subrequest in memory
case don't cause any harm, but inconsistent with other uses.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/ngx_http_upstream.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index a6397c99e..50c41e3ab 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -1682,8 +1682,7 @@ ngx_http_upstream_process_header(ngx_http_request_t *r, ngx_http_upstream_t *u) } if (u->input_filter_init(u->input_filter_ctx) == NGX_ERROR) { - ngx_http_upstream_finalize_request(r, u, - NGX_HTTP_INTERNAL_SERVER_ERROR); + ngx_http_upstream_finalize_request(r, u, NGX_ERROR); return; } |