# HG changeset patch # User Maxim Dounin # Date 1374749760 -14400 # Node ID d44c3b36c53f9559d980243f54b6952bac76a855 # Parent 2c4eb6ecba26c3f03bdf98f4622fb63eade0548d 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. 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 @@ -1682,8 +1682,7 @@ ngx_http_upstream_process_header(ngx_htt } 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; }