commit eaf08f772255f307d8b8a469c7d3e192c71988bf
author Piotr Sikora <piotrsikora@google.com> Tue Apr 04 02:01:45 2017 -0700
committer Piotr Sikora <piotrsikora@google.com> Wed May 17 01:13:01 2017 +0000
tree b298758e0c38efe664c5777228ff0510530511d7
parent b7ac9030eef4a4ffdd350a02327ea5fb71d674e3

Upstream: ignore read-readiness if request wasn't sent.

Change-Id: I95b16fa38d8d859add15e2acf25a83392793f7ee
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
Reviewed-on: https://nginx-review.googlesource.com/2921
Reviewed-by: Feng Li <fengli@google.com>

src/http/ngx_http_upstream.c

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index fbbc4b4..e7bde16 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2232,8 +2232,12 @@
         return;
     }
 
-    if (!u->request_sent && ngx_http_upstream_test_connect(c) != NGX_OK) {
-        ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
+    if (!u->request_sent) {
+        if (ngx_http_upstream_test_connect(c) != NGX_OK) {
+            ngx_http_upstream_next(r, u, NGX_HTTP_UPSTREAM_FT_ERROR);
+            return;
+        }
+
         return;
     }