diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-11-11 14:00:51 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2004-11-11 14:00:51 +0000 |
| commit | 34657fc5efa99f80c13deec0c3f5d3774b97b920 (patch) | |
| tree | 0c8abef4c96147f4d928107cdd1e846f350c34b5 /src/os/unix/ngx_channel.c | |
| parent | 4778f02ca6d950751fcc59b55ff1c44a5eba528c (diff) | |
| download | nginx-0.1.5.tar.gz | |
Changes with nginx 0.1.5 11 Nov 2004v0.1.5
*) Bugfix: on Solaris and Linux there may be too many "recvmsg() returned
not enough data" alerts.
*) Bugfix: there were the "writev() failed (22: Invalid argument)" errors
on Solaris in proxy mode without sendfile. On other platforms that do
not support sendfile at all the process got caught in an endless loop.
*) Bugfix: segmentation fault on Solaris in proxy mode and using sendfile.
*) Bugfix: segmentation fault on Solaris.
*) Bugfix: on-line upgrade did not work on Linux.
*) Bugfix: the ngx_http_autoindex_module module did not escape the
spaces, the quotes, and the percent signs in the directory listing.
*) Change: the decrease of the copy operations.
*) Feature: the userid_p3p directive.
Diffstat (limited to 'src/os/unix/ngx_channel.c')
| -rw-r--r-- | src/os/unix/ngx_channel.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/os/unix/ngx_channel.c b/src/os/unix/ngx_channel.c index 3d09d68bb..5c5a5e10b 100644 --- a/src/os/unix/ngx_channel.c +++ b/src/os/unix/ngx_channel.c @@ -120,9 +120,14 @@ ngx_int_t ngx_read_channel(ngx_socket_t s, ngx_channel_t *ch, size_t size, return NGX_ERROR; } + if (n == 0) { + ngx_log_debug0(NGX_LOG_DEBUG_CORE, log, 0, "recvmsg() returned zero"); + return NGX_ERROR; + } + if ((size_t) n < sizeof(ngx_channel_t)) { ngx_log_error(NGX_LOG_ALERT, log, 0, - "recvmsg() returned not enough data"); + "recvmsg() returned not enough data: %uz", n); return NGX_ERROR; } |