From: Vladimir Homutov <vl@nginx.com>
Date: Wed, 11 Jan 2017 09:01:56 +0000 (+0300)
Subject: Stream: avoid infinite loop in case of socket read error.
X-Git-Tag: release-1.11.9~10
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=b580770f3afaeec48a15cb8c9d2f9cf72b14e4da;p=nginx.git

Stream: avoid infinite loop in case of socket read error.
---

diff --git a/src/stream/ngx_stream_proxy_module.c b/src/stream/ngx_stream_proxy_module.c
index bfd78d5bb..81a0891de 100644
--- a/src/stream/ngx_stream_proxy_module.c
+++ b/src/stream/ngx_stream_proxy_module.c
@@ -1534,8 +1534,9 @@ ngx_stream_proxy_process(ngx_stream_session_t *s, ngx_uint_t from_upstream,
 
         size = b->end - b->last;
 
-        if (size && src->read->ready && !src->read->delayed) {
-
+        if (size && src->read->ready && !src->read->delayed
+            && !src->read->error)
+        {
             if (limit_rate) {
                 limit = (off_t) limit_rate * (ngx_time() - u->start_sec + 1)
                         - *received;