diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-11-29 20:48:01 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-11-29 20:48:01 +0000 |
| commit | 601ab90cd45030f28ac479ef4fd3ae761dcfb88c (patch) | |
| tree | bd5756817a4044d6d6313593a10b518717ea9b15 | |
| parent | a1b92a96598ff9d54cdf5805c3e74ee266d349a4 (diff) | |
| download | nginx-601ab90cd45030f28ac479ef4fd3ae761dcfb88c.tar.gz nginx-601ab90cd45030f28ac479ef4fd3ae761dcfb88c.zip | |
fix handling cached HTTP/0.9 response
| -rw-r--r-- | src/http/ngx_http_file_cache.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_upstream.c | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/http/ngx_http_file_cache.c b/src/http/ngx_http_file_cache.c index 431b1e52b..4290c9f86 100644 --- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -338,7 +338,7 @@ ngx_http_file_cache_read(ngx_http_request_t *r, ngx_http_cache_t *c) return n; } - if ((size_t) n <= c->header_start) { + if ((size_t) n < c->header_start) { ngx_log_error(NGX_LOG_CRIT, r->connection->log, 0, "cache file \"%s\" is too small", c->file.name.data); return NGX_ERROR; diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index b82bfa97b..9f1a89753 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -752,6 +752,11 @@ ngx_http_upstream_cache_send(ngx_http_request_t *r, ngx_http_upstream_t *u) r->cached = 1; c = r->cache; + if (c->header_start == c->body_start) { + r->http_version = NGX_HTTP_VERSION_9; + return ngx_http_cache_send(r); + } + /* TODO: cache stack */ u->buffer = *c->buf; |