commit 60d508ceb9c5ad867d33b819c9dfbdf05b9eef4b
author Piotr Sikora <piotr@cloudflare.com> Tue Feb 11 21:54:42 2014 -0800
committer Piotr Sikora <piotr@cloudflare.com> Tue Feb 11 21:54:42 2014 -0800
tree e0ea85fc89cfd2f3c3c71867c2653580d50a9b2b
parent cd358e5a95fb770f30207fffe8e45dbc2bb7e52b

Upstream: fix $upstream_status variable.

Previously, upstream's status code was overwritten with
cached response's status code when STALE or REVALIDATED
response was sent to the client.

Signed-off-by: Piotr Sikora <piotr@cloudflare.com>

src/http/modules/ngx_http_proxy_module.c

diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 9346998..8ee32f4 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -1362,7 +1362,7 @@
         return NGX_OK;
     }
 
-    if (u->state) {
+    if (u->state && u->state->status == 0) {
         u->state->status = ctx->status.code;
     }