Bugfix of r4086: directio was always enabled if mp4 file was sent as is.

This commit is contained in:
Igor Sysoev 2011-09-09 11:13:55 +00:00
parent 2d06be2437
commit 5d01ac5af3

View File

@ -410,6 +410,7 @@ ngx_http_mp4_handler(ngx_http_request_t *r)
ngx_memzero(&of, sizeof(ngx_open_file_info_t)); ngx_memzero(&of, sizeof(ngx_open_file_info_t));
of.read_ahead = clcf->read_ahead; of.read_ahead = clcf->read_ahead;
of.directio = NGX_MAX_OFF_T_VALUE;
of.valid = clcf->open_file_cache_valid; of.valid = clcf->open_file_cache_valid;
of.min_uses = clcf->open_file_cache_min_uses; of.min_uses = clcf->open_file_cache_min_uses;
of.errors = clcf->open_file_cache_errors; of.errors = clcf->open_file_cache_errors;
@ -534,6 +535,8 @@ ngx_http_mp4_handler(ngx_http_request_t *r)
ngx_directio_on_n " \"%s\" failed", path.data); ngx_directio_on_n " \"%s\" failed", path.data);
} }
of.is_directio = 1;
if (mp4) { if (mp4) {
mp4->file.directio = 1; mp4->file.directio = 1;
} }