Mercurial > hg > nginx

diff src/http/ngx_http_upstream.c @ 5827:54e9b83d00f0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: avoided directly terminating the connection. When memory allocation failed in ngx_http_upstream_cache(), the connection would be terminated directly in ngx_http_upstream_init_request(). Return a INTERNAL_SERVER_ERROR response instead.
author FengGu <flygoast@126.com>
date Wed, 13 Aug 2014 14:53:55 +0800
parents fe8bafab5b49
children d09b689911ac
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c	Mon Sep 08 21:36:09 2014 +0400
+++ b/src/http/ngx_http_upstream.c	Wed Aug 13 14:53:55 2014 +0800
@@ -519,6 +519,11 @@
             return;
         }
 
+        if (rc == NGX_ERROR) {
+            ngx_http_finalize_request(r, NGX_HTTP_INTERNAL_SERVER_ERROR);
+            return;
+        }
+
         if (rc != NGX_DECLINED) {
             ngx_http_finalize_request(r, rc);
             return;