Mercurial > hg > nginx

comparison src/http/ngx_http_upstream.c @ 5500:6a3ab6fdd70f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upstream: Cache-Control preferred over Expires. Not really a strict check (as X-Accel-Expires might be ignored or contain invalid value), but quite simple to implement and better than what we have now.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 04 Jan 2014 03:32:10 +0400
parents 6d357b2a9d6e
children 17134d29782e
comparison
equal deleted inserted replaced
5499:b91bcba29351 5500:6a3ab6fdd70f
3654 3654
3655 if (r->cache == NULL) { 3655 if (r->cache == NULL) {
3656 return NGX_OK; 3656 return NGX_OK;
3657 } 3657 }
3658 3658
3659 if (r->cache->valid_sec != 0) { 3659 if (r->cache->valid_sec != 0 && u->headers_in.x_accel_expires != NULL) {
3660 return NGX_OK; 3660 return NGX_OK;
3661 } 3661 }
3662 3662
3663 p = h->value.data; 3663 p = h->value.data;
3664 last = p + h->value.len; 3664 last = p + h->value.len;