Mercurial > hg > nginx

diff src/core/ngx_conf_file.c @ 5046:f4809ba58b15 stable-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Sun, 10 Feb 2013 03:55:18 +0000
parents 43b7b9572fe1
children a0599b56e748 004af18ddb86
line wrap: on
line diff
--- 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);