Fijxu/nginx-quic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cache: c->reading flag introduced.

Browse source 
It replaces c->buf in checks in ngx_http_file_cache_open(), making it possible
to reopen the file without clearing c->buf.  No functional changes.
This commit is contained in:
Maxim Dounin 2014-10-27 21:14:07 +03:00
parent 9e21d76c07
commit 8814be7b19
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/http/ngx_http_cache.h
View file

@ -101,6 +101,7 @@ struct ngx_http_cache_s {
unsigned updating:1; unsigned updating:1;
unsigned exists:1; unsigned exists:1;
unsigned temp_file:1; unsigned temp_file:1;
unsigned reading:1;
}; };

5
src/http/ngx_http_file_cache.c
View file

@ -259,7 +259,7 @@ ngx_http_file_cache_open(ngx_http_request_t *r)
return NGX_AGAIN; return NGX_AGAIN;
} }
if (c->buf) { if (c->reading) {
return ngx_http_file_cache_read(r, c); return ngx_http_file_cache_read(r, c);
} }
@ -620,9 +620,12 @@ ngx_http_file_cache_aio_read(ngx_http_request_t *r, ngx_http_cache_t *c)
n = ngx_file_aio_read(&c->file, c->buf->pos, c->body_start, 0, r->pool); n = ngx_file_aio_read(&c->file, c->buf->pos, c->body_start, 0, r->pool);
if (n != NGX_AGAIN) { if (n != NGX_AGAIN) {
c->reading = 0;
return n; return n;
} }
c->reading = 1;
c->file.aio->data = r; c->file.aio->data = r;
c->file.aio->handler = ngx_http_cache_aio_event_handler; c->file.aio->handler = ngx_http_cache_aio_event_handler;