Mercurial > hg > nginx-quic
comparison src/core/ngx_open_file_cache.c @ 3435:d65ba5392f59 stable-0.7
merge r3138, r3139, r3157, r3158, r3159, r3164, r3165,
r3202, r3203, r3383, r3388, r3417, r3418:
Win32 (mostly) and some Unix file related fixes:
*) preserve errno while ngx_free()
*) win32 ngx_file_info() utf8 support
*) delete Win95 code
*) log file name for read/write errors
*) test incomplete WriteFile()
*) handle short pwrite() to log an error cause: ENOSPC, EDQUOT, or EFBIG
*) uniform ngx_directio_on/off() interface with other file functions
*) do not create Win32 drive letter in ngx_create_full_path()
*) ignore EACCES errors for top level directories in ngx_create_full_path()
*) fix Win32 error messages when an temporary file replaces an existent file:
*) do not rename an already renamed file
*) now ngx_win32_rename_file() returns error code
*) do not log failure inside ngx_win32_rename_file()
*) fix Win32 error message when an temporary file replaces an existent file:
return at once if ngx_win32_rename_file() was not failed
and do not try to delete already the renamed temporary file
*) skip URI trailing spaces under Win32
*) disable Win32 short file names
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 01 Feb 2010 15:06:25 +0000 |
parents | 2f731201b00e |
children | 975f0558aab3 8944c3e318ab |
comparison
equal
deleted
inserted
replaced
3434:8d310fbeaa38 | 3435:d65ba5392f59 |
---|---|
523 | 523 |
524 } else { | 524 } else { |
525 of->fd = fd; | 525 of->fd = fd; |
526 | 526 |
527 if (of->directio <= ngx_file_size(&fi)) { | 527 if (of->directio <= ngx_file_size(&fi)) { |
528 if (ngx_directio_on(fd) == -1) { | 528 if (ngx_directio_on(fd) == NGX_FILE_ERROR) { |
529 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, | 529 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, |
530 ngx_directio_on_n " \"%s\" failed", name); | 530 ngx_directio_on_n " \"%s\" failed", name); |
531 | 531 |
532 } else { | 532 } else { |
533 of->is_directio = 1; | 533 of->is_directio = 1; |