From: Thibault Charbonnier <thibaultcha@fastmail.com>
Date: Wed, 25 Jan 2017 01:52:39 +0000 (-0800)
Subject: Upstream: removed unused ngx_http_upstream_conf_t.timeout field.
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=bbb82a736ffafcf437eb6e2077cb4bfa5db35e5c;p=nginx.git

Upstream: removed unused ngx_http_upstream_conf_t.timeout field.
---

diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index 448d0714f..d4f52afdf 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -151,7 +151,6 @@ typedef struct {
     ngx_msec_t                       connect_timeout;
     ngx_msec_t                       send_timeout;
     ngx_msec_t                       read_timeout;
-    ngx_msec_t                       timeout;
     ngx_msec_t                       next_upstream_timeout;
 
     size_t                           send_lowat;