IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix building --without-http-cache, introduced in r2664 and later

Browse Source
This commit is contained in:
Igor Sysoev 2009-04-15 12:25:51 +00:00
parent dc7a872a43
commit 9bd1010164
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/http/ngx_http_upstream.c
View File

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