Mercurial > hg > nginx
changeset 5453:b7b8e2fa7ebd
Fixed null pointer dereference with $upstream_cache_last_modified.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Tue, 03 Dec 2013 15:11:24 +0400 |
parents | b7bf4671bb7b |
children | 359f49a84f87 |
files | src/http/ngx_http_upstream.c |
diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -4555,7 +4555,8 @@ ngx_http_upstream_cache_last_modified(ng { u_char *p; - if (!r->upstream->conf->cache_revalidate + if (r->upstream == NULL + || !r->upstream->conf->cache_revalidate || r->upstream->cache_status != NGX_HTTP_CACHE_EXPIRED || r->cache->last_modified == -1) {