diff options
author | Igor Sysoev <igor@sysoev.ru> | 2009-04-08 19:13:28 +0000 |
---|---|---|
committer | Igor Sysoev <igor@sysoev.ru> | 2009-04-08 19:13:28 +0000 |
commit | a2de7b9b93a15128a46ba0186fddc2bdeed6c7cb (patch) | |
tree | 7b565e5067335be0bf7c1a47c3524fce25e39a69 /src/core/ngx_cycle.c | |
parent | 2ec2e35efe1bf1b704d0e9ca1fa9667d9a5a5447 (diff) | |
download | nginx-a2de7b9b93a15128a46ba0186fddc2bdeed6c7cb.tar.gz nginx-a2de7b9b93a15128a46ba0186fddc2bdeed6c7cb.zip |
delete win32 ngx_file_append_mode() as we use reliable
FILE_APPEND_DATA|SYNCHRONIZE flags
Diffstat (limited to 'src/core/ngx_cycle.c')
-rw-r--r-- | src/core/ngx_cycle.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 8635895e1..91188cf5b 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -375,14 +375,7 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) goto failed; } -#if (NGX_WIN32) - if (ngx_file_append_mode(file[i].fd) != NGX_OK) { - ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, - ngx_file_append_mode_n " \"%s\" failed", - file[i].name.data); - goto failed; - } -#else +#if !(NGX_WIN32) if (fcntl(file[i].fd, F_SETFD, FD_CLOEXEC) == -1) { ngx_log_error(NGX_LOG_EMERG, log, ngx_errno, "fcntl(FD_CLOEXEC) \"%s\" failed", @@ -1077,21 +1070,7 @@ ngx_reopen_files(ngx_cycle_t *cycle, ngx_uid_t user) continue; } -#if (NGX_WIN32) - if (ngx_file_append_mode(fd) == NGX_ERROR) { - ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, - ngx_file_append_mode_n " \"%s\" failed", - file[i].name.data); - - if (ngx_close_file(fd) == NGX_FILE_ERROR) { - ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, - ngx_close_file_n " \"%s\" failed", - file[i].name.data); - } - - continue; - } -#else +#if !(NGX_WIN32) if (user != (ngx_uid_t) NGX_CONF_UNSET_UINT) { ngx_file_info_t fi; |