aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPiotr Sikora <piotr@cloudflare.com>2014-10-01 15:48:53 -0700
committerPiotr Sikora <piotr@cloudflare.com>2014-10-01 15:48:53 -0700
commit4a2fba2d46d8d315a3dd3792d9f9c2d13e17a794 (patch)
treee21018a56714d6882648ce4a12b0bb0209360cd9 /src
parent840b347bb24bea09f9824891239929cdce84e47b (diff)
downloadnginx-4a2fba2d46d8d315a3dd3792d9f9c2d13e17a794.tar.gz
nginx-4a2fba2d46d8d315a3dd3792d9f9c2d13e17a794.zip
Upstream: fix $upstream_cache_last_modified variable.
Due to the u->headers_in.last_modified_time not being correctly initialized, this variable was evaluated to "Thu, 01 Jan 1970 00:00:00 GMT" for responses cached without the "Last-Modified" header which resulted in subsequent proxy requests being sent with "If-Modified-Since: Thu, 01 Jan 1970 00:00:00 GMT" header. Signed-off-by: Piotr Sikora <piotr@cloudflare.com>
Diffstat (limited to 'src')
-rw-r--r--src/http/ngx_http_upstream.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index d547ca74e..d574a6a31 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -441,6 +441,7 @@ ngx_http_upstream_create(ngx_http_request_t *r)
#endif
u->headers_in.content_length_n = -1;
+ u->headers_in.last_modified_time = -1;
return NGX_OK;
}
@@ -885,6 +886,7 @@ ngx_http_upstream_cache_send(ngx_http_request_t *r, ngx_http_upstream_t *u)
ngx_memzero(&u->headers_in, sizeof(ngx_http_upstream_headers_in_t));
u->headers_in.content_length_n = -1;
+ u->headers_in.last_modified_time = -1;
if (ngx_list_init(&u->headers_in.headers, r->pool, 8,
sizeof(ngx_table_elt_t))
@@ -1582,6 +1584,7 @@ ngx_http_upstream_reinit(ngx_http_request_t *r, ngx_http_upstream_t *u)
ngx_memzero(&u->headers_in, sizeof(ngx_http_upstream_headers_in_t));
u->headers_in.content_length_n = -1;
+ u->headers_in.last_modified_time = -1;
if (ngx_list_init(&u->headers_in.headers, r->pool, 8,
sizeof(ngx_table_elt_t))