diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-11-12 14:35:09 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-11-12 14:35:09 +0000 |
| commit | 7e932d6a50efe3e750cc87f0729cad6ab75aad9f (patch) | |
| tree | 655010209821a877a3ab589e366f2dbf161f45f6 /src/os/unix | |
| parent | 474f1eefb6c45f66de15918510adf3638aca36cc (diff) | |
| download | nginx-7e932d6a50efe3e750cc87f0729cad6ab75aad9f.tar.gz nginx-7e932d6a50efe3e750cc87f0729cad6ab75aad9f.zip | |
nginx-0.1.7-RELEASE importrelease-0.1.7
*) Bugfix: on FreeBSD the segmentation fault may occur if the size of
the transferred file was changed; the bug had appeared in 0.1.5.
Diffstat (limited to 'src/os/unix')
| -rw-r--r-- | src/os/unix/ngx_channel.c | 4 | ||||
| -rw-r--r-- | src/os/unix/ngx_socket.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/os/unix/ngx_channel.c b/src/os/unix/ngx_channel.c index 5c5a5e10b..0bfbd0de6 100644 --- a/src/os/unix/ngx_channel.c +++ b/src/os/unix/ngx_channel.c @@ -233,10 +233,10 @@ ngx_int_t ngx_add_channel_event(ngx_cycle_t *cycle, ngx_fd_t fd, void ngx_close_channel(ngx_fd_t *fd, ngx_log_t *log) { if (close(fd[0]) == -1) { - ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "close() failed"); + ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "close() channel failed"); } if (close(fd[1]) == -1) { - ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "close() failed"); + ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, "close() channel failed"); } } diff --git a/src/os/unix/ngx_socket.h b/src/os/unix/ngx_socket.h index c6eb9413f..4dcf924e0 100644 --- a/src/os/unix/ngx_socket.h +++ b/src/os/unix/ngx_socket.h @@ -54,7 +54,7 @@ int ngx_tcp_push(ngx_socket_t s); #define ngx_shutdown_socket_n "shutdown()" #define ngx_close_socket close -#define ngx_close_socket_n "close()" +#define ngx_close_socket_n "close() socket" #endif /* _NGX_SOCKET_H_INCLUDED_ */ |