From: Maxim Dounin <mdounin@mdounin.ru>
Date: Mon, 9 Oct 2017 12:59:10 +0000 (+0300)
Subject: Upstream: even better handling of invalid headers in cache files.
X-Git-Tag: release-1.13.6~2
X-Git-Url: http://git.kaiwu.me/postgresql/log/contrib/postgres_fdw/static/gitweb.js?a=commitdiff_plain;h=0737e6d841d87e734dfb980a59094c26621bb80d;p=nginx.git

Upstream: even better handling of invalid headers in cache files.

When parsing of headers in a cache file fails, already parsed headers
need to be cleared, and protocol state needs to be reinitialized.  To do
so, u->request_sent is now set to ensure ngx_http_upstream_reinit() will
be called.

This change complements improvements in 46ddff109e72.
---

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 985d633e0..1f6a8fe0c 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -584,6 +584,7 @@ ngx_http_upstream_init_request(ngx_http_request_t *r)
                 r->cached = 0;
                 u->buffer.start = NULL;
                 u->cache_status = NGX_HTTP_CACHE_MISS;
+                u->request_sent = 1;
             }
 
             if (ngx_http_upstream_cache_background_update(r, u) != NGX_OK) {