Mercurial > hg > nginx
comparison src/core/nginx.c @ 3432:20871c5e1d5d stable-0.7
merge r3200:
nginx did not close log file set by --error-log-path,
the bug was introduced in r2744
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 01 Feb 2010 14:44:43 +0000 |
parents | 08570d26c7c5 |
children |
comparison
equal
deleted
inserted
replaced
3431:4edce2b6b285 | 3432:20871c5e1d5d |
---|---|
378 ngx_set_stderr_n " failed"); | 378 ngx_set_stderr_n " failed"); |
379 return 1; | 379 return 1; |
380 } | 380 } |
381 } | 381 } |
382 | 382 |
383 if (log->file->fd != ngx_stderr) { | |
384 if (ngx_close_file(log->file->fd) == NGX_FILE_ERROR) { | |
385 ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, | |
386 ngx_close_file_n " built-in log failed"); | |
387 } | |
388 } | |
389 | |
383 ngx_use_stderr = 0; | 390 ngx_use_stderr = 0; |
384 | 391 |
385 if (ngx_process == NGX_PROCESS_SINGLE) { | 392 if (ngx_process == NGX_PROCESS_SINGLE) { |
386 ngx_single_process_cycle(cycle); | 393 ngx_single_process_cycle(cycle); |
387 | 394 |