Mercurial > hg > nginx

comparison src/http/ngx_http_file_cache.c @ 3968:d7ed8b8b0cdd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update the previous commit: removing dependencies on file uniq since WIN32_FIND_DATA has no such field
author Igor Sysoev <igor@sysoev.ru>
date Sun, 24 Jul 2011 17:36:26 +0000
parents 83e41f6f6d96
children 3ea15c6b16da
comparison
equal deleted inserted replaced
3967:83e41f6f6d96 3968:d7ed8b8b0cdd
1364 if (ngx_fd_info(fd, &fi) == NGX_FILE_ERROR) { 1364 if (ngx_fd_info(fd, &fi) == NGX_FILE_ERROR) {
1365 ngx_log_error(NGX_LOG_CRIT, ctx->log, ngx_errno, 1365 ngx_log_error(NGX_LOG_CRIT, ctx->log, ngx_errno,
1366 ngx_fd_info_n " \"%s\" failed", name->data); 1366 ngx_fd_info_n " \"%s\" failed", name->data);
1367 1367
1368 } else { 1368 } else {
1369 c.uniq = ngx_file_uniq(&fi);
1370 c.length = ngx_file_size(&fi); 1369 c.length = ngx_file_size(&fi);
1371 c.fs_size = (ngx_file_fs_size(&fi) + cache->bsize - 1) / cache->bsize; 1370 c.fs_size = (ngx_file_fs_size(&fi) + cache->bsize - 1) / cache->bsize;
1372 } 1371 }
1373 1372
1374 if (ngx_close_file(fd) == NGX_FILE_ERROR) { 1373 if (ngx_close_file(fd) == NGX_FILE_ERROR) {
1424 fcn->valid_msec = 0; 1423 fcn->valid_msec = 0;
1425 fcn->error = 0; 1424 fcn->error = 0;
1426 fcn->exists = 1; 1425 fcn->exists = 1;
1427 fcn->updating = 0; 1426 fcn->updating = 0;
1428 fcn->deleting = 0; 1427 fcn->deleting = 0;
1429 fcn->uniq = c->uniq; 1428 fcn->uniq = 0;
1430 fcn->valid_sec = 0; 1429 fcn->valid_sec = 0;
1431 fcn->body_start = 0; 1430 fcn->body_start = 0;
1432 fcn->fs_size = c->fs_size; 1431 fcn->fs_size = c->fs_size;
1433 1432
1434 cache->sh->size += c->fs_size; 1433 cache->sh->size += c->fs_size;