# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1239794258 0
# Node ID 3b6afa999c2f2193f9b9efb13090ac13a1d008ab
# Parent  eace65d6092b2ddf265d85cdc3eb96d09b10dfff
support 304 for cacheable responses

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -1958,6 +1958,7 @@ ngx_http_upstream_send_response(ngx_http
 
         } else {
             u->cacheable = 0;
+            r->headers_out.last_modified_time = -1;
         }
     }
 
@@ -3179,7 +3180,7 @@ ngx_http_upstream_copy_last_modified(ngx
 
 #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);