diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 14:31:26 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 14:31:26 +0000 |
| commit | 987f1e5fcc2949cff76608910514b0ed82400f8f (patch) | |
| tree | 40cc339f306e1683b667bce11f241761a7e3c929 /src/core | |
| parent | d23a26796472ebcf3d161cd7b81fee18df3c1a0b (diff) | |
| download | nginx-987f1e5fcc2949cff76608910514b0ed82400f8f.tar.gz nginx-987f1e5fcc2949cff76608910514b0ed82400f8f.tar.bz2 | |
merge r3148, r3152, r3161:
error processing fixes:
*) fail if file size was changed
*) low default connection errors level from alert to error
*) low ENAMETOOLONG logging level
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ngx_connection.c | 6 | ||||
| -rw-r--r-- | src/core/ngx_output_chain.c | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index 0a7fe847d..01c205877 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -917,12 +917,8 @@ ngx_connection_error(ngx_connection_t *c, ngx_err_t err, char *text) level = NGX_LOG_INFO; break; - case NGX_ERROR_ERR: - level = NGX_LOG_ERR; - break; - default: - level = NGX_LOG_ALERT; + level = NGX_LOG_ERR; } } else { diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c index 6d6d241c1..bee7952ca 100644 --- a/src/core/ngx_output_chain.c +++ b/src/core/ngx_output_chain.c @@ -555,9 +555,7 @@ ngx_output_chain_copy_buf(ngx_output_chain_ctx_t *ctx) ngx_log_error(NGX_LOG_ALERT, ctx->pool->log, 0, ngx_read_file_n " read only %z of %O from \"%s\"", n, size, src->file->name.data); - if (n == 0) { - return NGX_ERROR; - } + return NGX_ERROR; } dst->last += n; |