From b217a2a46705b3fc6eb939fe112e5145ae263135 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Sun, 10 Feb 2013 03:55:18 +0000 Subject: Merge of r4967: ngx_write_fd() and ngx_read_fd() errors handling. The ngx_write_fd() and ngx_read_fd() functions return -1 in case of error, so the incorrect comparison with NGX_FILE_ERROR (which is 0 on windows platforms) might result in inaccurate error message in the error log. Also the ngx_errno global variable is being set only if the returned value is -1. --- src/core/ngx_conf_file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/ngx_conf_file.c') diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index 6da2dae80..12bb5cf8a 100644 --- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -983,7 +983,7 @@ ngx_conf_flush_files(ngx_cycle_t *cycle) n = ngx_write_fd(file[i].fd, file[i].buffer, len); - if (n == NGX_FILE_ERROR) { + if (n == -1) { ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, ngx_write_fd_n " to \"%s\" failed", file[i].name.data); -- cgit