From: Igor Sysoev <igor@sysoev.ru>
Date: Tue, 19 Jul 2011 13:52:56 +0000 (+0000)
Subject: merge r3945:
X-Git-Tag: release-0.8.55~2
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=5a80933ea069e2d307c9f384bade51d5618b56e0;p=nginx.git

merge r3945:

fix segfault if cache key is larger than upstream buffer size
patch by Lanshun Zhou
---

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index e8d87738f..62f1669c7 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -666,6 +666,15 @@ ngx_http_upstream_cache(ngx_http_request_t *r, ngx_http_upstream_t *u)
 
         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;
+        }
+
         u->cacheable = 1;
 
         c = r->cache;