Mercurial > hg > nginx
changeset 3944:f1f194ceab16
fix segfault if cache key is larger than upstream buffer size
patch by Lanshun Zhou
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 19 Jul 2011 11:24:16 +0000 |
parents | bfab2536197b |
children | fa2c37b1122c |
files | src/http/ngx_http_upstream.c |
diffstat | 1 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c Tue Jul 19 11:21:50 2011 +0000 +++ b/src/http/ngx_http_upstream.c Tue Jul 19 11:24:16 2011 +0000 @@ -661,6 +661,15 @@ ngx_http_file_cache_create_key(r); + if (r->cache->header_start >= u->conf->buffer_size) { + ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, + "cache key too large, increase upstream buffer size %uz", + u->conf->buffer_size); + + r->cache = NULL; + return NGX_DECLINED; + } + switch (ngx_http_test_predicates(r, u->conf->cache_bypass)) { case NGX_ERROR: