[nginx] Upstream: consistent error handling after u->input_filte...

Maxim Dounin mdounin at mdounin.ru
Thu Jul 25 11:58:49 UTC 2013


details:   http://hg.nginx.org/nginx/rev/d44c3b36c53f
branches:  
changeset: 5294:d44c3b36c53f
user:      Maxim Dounin <mdounin at mdounin.ru>
date:      Thu Jul 25 14:56:00 2013 +0400
description:
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:

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

diffs (13 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
@@ -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;
     }
 



More information about the nginx-devel mailing list