diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-03-29 18:18:42 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-03-29 18:18:42 +0000 |
| commit | e693243a9f0382486b74fe9ca4248f9e4eca507e (patch) | |
| tree | 452759c29f59fff4c2202acd7d6791a1f768d644 /src/os/unix/ngx_process_cycle.c | |
| parent | 4e2bbc23c1564ac1458dc17c5c6c38ca52ae012d (diff) | |
| download | nginx-e693243a9f0382486b74fe9ca4248f9e4eca507e.tar.gz nginx-e693243a9f0382486b74fe9ca4248f9e4eca507e.tar.bz2 | |
Merge of r5138: use of NGX_FILE_ERROR.
Use NGX_FILE_ERROR for handling file operations errors.
On Win32 platforms 0 is used to indicate errors in file operations, so
comparing against either -1 or NGX_OK is not portable.
This was not much of an issue in patched code, since only ngx_fd_info() test
is actually reachable on Win32 and in worst case it might result in bogus
error log entry.
Patch by Piotr Sikora.
Diffstat (limited to 'src/os/unix/ngx_process_cycle.c')
| -rw-r--r-- | src/os/unix/ngx_process_cycle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index c9b0266ed..dfdfae081 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -647,7 +647,7 @@ ngx_reap_children(ngx_cycle_t *cycle) if (ngx_rename_file((char *) ccf->oldpid.data, (char *) ccf->pid.data) - != NGX_OK) + == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, ngx_rename_file_n " %s back to %s failed " |