mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-18 01:30:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix a cached zero-length body case

Browse Source
This commit is contained in:
Igor Sysoev 2009-12-23 14:46:45 +00:00
parent bd375b9566
commit 3662f36a54
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/http/ngx_http_file_cache.c
View File

@ -783,7 +783,6 @@ ngx_http_file_cache_update(ngx_http_request_t *r, ngx_temp_file_t *tf)
ngx_int_t ngx_int_t
ngx_http_cache_send(ngx_http_request_t *r) ngx_http_cache_send(ngx_http_request_t *r)
{ {
off_t size;
ngx_int_t rc; ngx_int_t rc;
ngx_buf_t *b; ngx_buf_t *b;
ngx_chain_t out; ngx_chain_t out;
@ -806,21 +805,18 @@ ngx_http_cache_send(ngx_http_request_t *r)
return NGX_HTTP_INTERNAL_SERVER_ERROR; return NGX_HTTP_INTERNAL_SERVER_ERROR;
} }
r->header_only = (c->length - c->body_start) == 0;
rc = ngx_http_send_header(r); rc = ngx_http_send_header(r);
if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) { if (rc == NGX_ERROR || rc > NGX_OK || r->header_only) {
return rc; return rc;
} }
size = c->length - c->body_start;
if (size == 0) {
return rc;
}
b->file_pos = c->body_start; b->file_pos = c->body_start;
b->file_last = c->length; 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_buf = (r == r->main) ? 1: 0;
b->last_in_chain = 1; b->last_in_chain = 1;