# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1239798351 0
# Node ID 4c658be4ab6313779fbd6b7a204abb070288658f
# Parent  d7368a34b6fa0a0290b75281e6b8f7b5206dcf8c
fix building --without-http-cache, introduced in r2664 and later

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
@@ -2843,8 +2843,6 @@ static ngx_int_t
 ngx_http_upstream_process_cache_control(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset)
 {
-    u_char            *p, *last;
-    ngx_int_t          n;
     ngx_array_t       *pa;
     ngx_table_elt_t  **ph;
 
@@ -2864,6 +2862,11 @@ ngx_http_upstream_process_cache_control(
 
     *ph = h;
 
+#if (NGX_HTTP_CACHE)
+    {
+    u_char     *p, *last;
+    ngx_int_t   n;
+
     if (r->cache == NULL) {
         return NGX_OK;
     }
@@ -2909,6 +2912,9 @@ ngx_http_upstream_process_cache_control(
     }
 
     r->cache->valid_sec = ngx_time() + n;
+    }
+#endif
+
     return NGX_OK;
 }
 
@@ -2917,10 +2923,12 @@ static ngx_int_t
 ngx_http_upstream_process_expires(ngx_http_request_t *r, ngx_table_elt_t *h,
     ngx_uint_t offset)
 {
+    r->upstream->headers_in.expires = h;
+
+#if (NGX_HTTP_CACHE)
+    {
     time_t  expires;
 
-    r->upstream->headers_in.expires = h;
-
     if (r->cache == NULL) {
         return NGX_OK;
     }
@@ -2937,6 +2945,8 @@ ngx_http_upstream_process_expires(ngx_ht
     }
 
     r->cache->valid_sec = expires;
+    }
+#endif
 
     return NGX_OK;
 }
@@ -2946,12 +2956,14 @@ static ngx_int_t
 ngx_http_upstream_process_accel_expires(ngx_http_request_t *r,
     ngx_table_elt_t *h, ngx_uint_t offset)
 {
+    r->upstream->headers_in.x_accel_expires = h;
+
+#if (NGX_HTTP_CACHE)
+    {
     u_char     *p;
     size_t      len;
     ngx_int_t   n;
 
-    r->upstream->headers_in.x_accel_expires = h;
-
     if (r->cache == NULL) {
         return NGX_OK;
     }
@@ -2982,6 +2994,8 @@ ngx_http_upstream_process_accel_expires(
     if (n != NGX_ERROR) {
         r->cache->valid_sec = n;
     }
+    }
+#endif
 
     return NGX_OK;
 }