commit 76e15717491d6d4b227d715f3a80ae8859e30b5a
author Maxim Dounin <mdounin@mdounin.ru> Thu Jul 25 14:56:00 2013 +0400
committer Maxim Dounin <mdounin@mdounin.ru> Thu Jul 25 14:56:00 2013 +0400
tree 529bf9a028eb40c36f932ff6443c1602912fe1af
parent 9f925b8c777ba8ff3b852edddfe9be1b2a324cfd

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.

src/http/ngx_http_upstream.c

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index a6397c9..50c41e3 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1682,8 +1682,7 @@
     }
 
     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;
     }