Mercurial > hg > nginx-quic
changeset 3400:8e407e7c899e
fix a cached zero-length body case
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 23 Dec 2009 14:46:45 +0000 |
parents | ac9c0380337d |
children | 9e7926763f87 |
files | src/http/ngx_http_file_cache.c |
diffstat | 1 files changed, 3 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_file_cache.c +++ b/src/http/ngx_http_file_cache.c @@ -783,7 +783,6 @@ ngx_http_file_cache_update(ngx_http_requ ngx_int_t ngx_http_cache_send(ngx_http_request_t *r) { - off_t size; ngx_int_t rc; ngx_buf_t *b; ngx_chain_t out; @@ -806,21 +805,18 @@ ngx_http_cache_send(ngx_http_request_t * return NGX_HTTP_INTERNAL_SERVER_ERROR; } + r->header_only = (c->length - c->body_start) == 0; + rc = ngx_http_send_header(r); if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) { return rc; } - size = c->length - c->body_start; - if (size == 0) { - return rc; - } - b->file_pos = c->body_start; b->file_last = c->length; - b->in_file = size ? 1: 0; + b->in_file = 1; b->last_buf = (r == r->main) ? 1: 0; b->last_in_chain = 1;