# HG changeset patch # User Igor Sysoev # Date 1084292173 0 # Node ID be40e9893a196b9e6bd9637aa81b2dbf0bd33e4a # Parent 159dd60d257a07e38c8b513edfef1495755e2f1a nginx-0.0.3-2004-05-11-20:16:13 import diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -469,7 +469,7 @@ ngx_int_t ngx_create_pidfile(ngx_cycle_t file.log = cycle->log; file.fd = ngx_open_file(file.name.data, NGX_FILE_RDWR, - NGX_FILE_CREATE_OR_OPEN); + NGX_FILE_CREATE_OR_OPEN|NGX_FILE_TRUNCATE); if (file.fd == NGX_INVALID_FILE) { ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, diff --git a/src/http/ngx_http_write_filter.c b/src/http/ngx_http_write_filter.c --- a/src/http/ngx_http_write_filter.c +++ b/src/http/ngx_http_write_filter.c @@ -143,8 +143,10 @@ int ngx_http_write_filter(ngx_http_reque } if (size == 0) { - ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, - "the http output chain is empty"); + if (!last) { + ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, + "the http output chain is empty"); + } return NGX_OK; } diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h --- a/src/os/unix/ngx_files.h +++ b/src/os/unix/ngx_files.h @@ -19,6 +19,7 @@ #define NGX_FILE_RDWR O_RDWR #define NGX_FILE_CREATE_OR_OPEN O_CREAT #define NGX_FILE_OPEN 0 +#define NGX_FILE_TRUNCATE O_TRUNC #define NGX_FILE_APPEND O_APPEND