commit e41e7247261d98175f71c9362dd0878544177177
author Igor Sysoev <igor@sysoev.ru> Wed Apr 15 11:17:38 2009 +0000
committer Igor Sysoev <igor@sysoev.ru> Wed Apr 15 11:17:38 2009 +0000
tree 5016bf7c6946092a2864201674f0ad8e6dc3f61b
parent 50e1cc45609b94259d3a9f2474a2c4682de776c2

support 304 for cacheable responses

src/http/ngx_http_upstream.c

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index e7e8091..68b4d5a 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1958,6 +1958,7 @@
 
         } else {
             u->cacheable = 0;
+            r->headers_out.last_modified_time = -1;
         }
     }
 
@@ -3179,7 +3180,7 @@
 
 #if (NGX_HTTP_CACHE)
 
-    if (r->cached) {
+    if (r->cached || r->upstream->cacheable) {
         r->headers_out.last_modified = ho;
         r->headers_out.last_modified_time = ngx_http_parse_time(h->value.data,
                                                                 h->value.len);