From 7c274e056efcdcfbe6954e0442e280ce4ff13c8b Mon Sep 17 00:00:00 2001
From: "Yichun Zhang (agentzh)" <agentzh@gmail.com>
Date: Fri, 1 Jul 2016 12:17:53 -0700
Subject: [PATCH] feature: added the upstream_timeout_fields patch to the nginx
 core to allow per-request connect/send/read timeout settings for individual
 upstream requests and retries.

---
 ...nginx-1.9.15-upstream_timeout_fields.patch | 120 ++++++++++++++++++
 util/mirror-tarballs                          |   4 +
 util/ver                                      |   2 +-
 3 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 patches/nginx-1.9.15-upstream_timeout_fields.patch

diff --git a/patches/nginx-1.9.15-upstream_timeout_fields.patch b/patches/nginx-1.9.15-upstream_timeout_fields.patch
new file mode 100644
index 0000000..7d994c8
--- /dev/null
+++ b/patches/nginx-1.9.15-upstream_timeout_fields.patch
@@ -0,0 +1,120 @@
+diff -r 13070ecfda67 src/http/ngx_http_upstream.c
+--- a/src/http/ngx_http_upstream.c	Tue Apr 19 19:02:37 2016 +0300
++++ b/src/http/ngx_http_upstream.c	Fri Jul 01 12:14:53 2016 -0700
+@@ -481,12 +481,19 @@ void
+ ngx_http_upstream_init(ngx_http_request_t *r)
+ {
+     ngx_connection_t     *c;
++    ngx_http_upstream_t  *u;
+ 
+     c = r->connection;
+ 
+     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, c->log, 0,
+                    "http init upstream, client timer: %d", c->read->timer_set);
+ 
++    u = r->upstream;
++
++    u->connect_timeout = u->conf->connect_timeout;
++    u->send_timeout = u->conf->send_timeout;
++    u->read_timeout = u->conf->read_timeout;
++
+ #if (NGX_HTTP_V2)
+     if (r->stream) {
+         ngx_http_upstream_init_request(r);
+@@ -1451,7 +1458,7 @@ ngx_http_upstream_connect(ngx_http_reque
+     u->request_body_sent = 0;
+ 
+     if (rc == NGX_AGAIN) {
+-        ngx_add_timer(c->write, u->conf->connect_timeout);
++        ngx_add_timer(c->write, u->connect_timeout);
+         return;
+     }
+ 
+@@ -1540,7 +1547,7 @@ ngx_http_upstream_ssl_init_connection(ng
+     if (rc == NGX_AGAIN) {
+ 
+         if (!c->write->timer_set) {
+-            ngx_add_timer(c->write, u->conf->connect_timeout);
++            ngx_add_timer(c->write, u->connect_timeout);
+         }
+ 
+         c->ssl->handler = ngx_http_upstream_ssl_handshake;
+@@ -1816,7 +1823,7 @@ ngx_http_upstream_send_request(ngx_http_
+ 
+     if (rc == NGX_AGAIN) {
+         if (!c->write->ready) {
+-            ngx_add_timer(c->write, u->conf->send_timeout);
++            ngx_add_timer(c->write, u->send_timeout);
+ 
+         } else if (c->write->timer_set) {
+             ngx_del_timer(c->write);
+@@ -1859,7 +1866,7 @@ ngx_http_upstream_send_request(ngx_http_
+         return;
+     }
+ 
+-    ngx_add_timer(c->read, u->conf->read_timeout);
++    ngx_add_timer(c->read, u->read_timeout);
+ 
+     if (c->read->ready) {
+         ngx_http_upstream_process_header(r, u);
+@@ -2658,7 +2665,7 @@ ngx_http_upstream_process_body_in_memory
+     }
+ 
+     if (rev->active) {
+-        ngx_add_timer(rev, u->conf->read_timeout);
++        ngx_add_timer(rev, u->read_timeout);
+ 
+     } else if (rev->timer_set) {
+         ngx_del_timer(rev);
+@@ -2982,7 +2989,7 @@ ngx_http_upstream_send_response(ngx_http
+         p->cyclic_temp_file = 0;
+     }
+ 
+-    p->read_timeout = u->conf->read_timeout;
++    p->read_timeout = u->read_timeout;
+     p->send_timeout = clcf->send_timeout;
+     p->send_lowat = clcf->send_lowat;
+ 
+@@ -3239,7 +3246,7 @@ ngx_http_upstream_process_upgraded(ngx_h
+     }
+ 
+     if (upstream->write->active && !upstream->write->ready) {
+-        ngx_add_timer(upstream->write, u->conf->send_timeout);
++        ngx_add_timer(upstream->write, u->send_timeout);
+ 
+     } else if (upstream->write->timer_set) {
+         ngx_del_timer(upstream->write);
+@@ -3251,7 +3258,7 @@ ngx_http_upstream_process_upgraded(ngx_h
+     }
+ 
+     if (upstream->read->active && !upstream->read->ready) {
+-        ngx_add_timer(upstream->read, u->conf->read_timeout);
++        ngx_add_timer(upstream->read, u->read_timeout);
+ 
+     } else if (upstream->read->timer_set) {
+         ngx_del_timer(upstream->read);
+@@ -3444,7 +3451,7 @@ ngx_http_upstream_process_non_buffered_r
+     }
+ 
+     if (upstream->read->active && !upstream->read->ready) {
+-        ngx_add_timer(upstream->read, u->conf->read_timeout);
++        ngx_add_timer(upstream->read, u->read_timeout);
+ 
+     } else if (upstream->read->timer_set) {
+         ngx_del_timer(upstream->read);
+diff -r 13070ecfda67 src/http/ngx_http_upstream.h
+--- a/src/http/ngx_http_upstream.h	Tue Apr 19 19:02:37 2016 +0300
++++ b/src/http/ngx_http_upstream.h	Fri Jul 01 12:14:53 2016 -0700
+@@ -309,6 +309,12 @@ struct ngx_http_upstream_s {
+     ngx_chain_writer_ctx_t           writer;
+ 
+     ngx_http_upstream_conf_t        *conf;
++
++#define HAVE_UPSTREAM_TIMEOUT_FIELDS  1
++    ngx_msec_t                       connect_timeout;
++    ngx_msec_t                       send_timeout;
++    ngx_msec_t                       read_timeout;
++
+ #if (NGX_HTTP_CACHE)
+     ngx_array_t                     *caches;
+ #endif
diff --git a/util/mirror-tarballs b/util/mirror-tarballs
index dda64c6..9af0082 100755
--- a/util/mirror-tarballs
+++ b/util/mirror-tarballs
@@ -325,6 +325,10 @@ echo "$info_txt applying the ssl_cert_cb_yield.patch patch to nginx"
 patch -p1 < $root/patches/nginx-$main_ver-ssl_cert_cb_yield.patch
 echo
 
+echo "$info_txt applying the upstream_timeout_fields patch for nginx"
+patch -p1 < $root/patches/nginx-$main_ver-upstream_timeout_fields.patch || exit 1
+echo
+
 cd .. || exit 1
 
 cp $root/patches/nginx-$main_ver-no_pool.patch ./nginx-no_pool.patch || exit 1
diff --git a/util/ver b/util/ver
index ad5f2b9..6d3fbd5 100755
--- a/util/ver
+++ b/util/ver
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 main_ver=1.9.15
-minor_ver=1
+minor_ver=2rc0
 version=$main_ver.$minor_ver
 echo $version