diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-11-12 14:33:15 +0000 |
|---|---|---|
| committer | Jonathan Kolb <jon@b0g.us> | 2004-11-12 14:33:15 +0000 |
| commit | 0d3047e035b161d5d60c49913b449af3fd8a47a3 (patch) | |
| tree | 782c352485b998004be42182e8f3513d12689020 | |
| parent | efb43412ac8f282a7d7302e815931a744954dadb (diff) | |
| download | nginx-0d3047e035b161d5d60c49913b449af3fd8a47a3.tar.gz | |
Changes with nginx 0.1.7 12 Nov 2004v0.1.7
*) Bugfix: on FreeBSD the segmentation fault may occure if the size of
the transferred file was changed; bug appeared in 0.1.2.
| -rw-r--r-- | CHANGES | 6 | ||||
| -rw-r--r-- | CHANGES.ru | 7 | ||||
| -rw-r--r-- | src/core/nginx.h | 2 | ||||
| -rw-r--r-- | src/http/modules/ngx_http_static_handler.c | 1 | ||||
| -rw-r--r-- | src/os/unix/ngx_channel.c | 4 | ||||
| -rw-r--r-- | src/os/unix/ngx_socket.h | 2 |
6 files changed, 18 insertions, 4 deletions
@@ -1,4 +1,10 @@ +Changes with nginx 0.1.7 12 Nov 2004 + + *) Bugfix: on FreeBSD the segmentation fault may occure if the size of + the transferred file was changed; bug appeared in 0.1.2. + + Changes with nginx 0.1.6 11 Nov 2004 *) Bugfix: some location directive combiations with the regular diff --git a/CHANGES.ru b/CHANGES.ru index c4d3d5276..3f6d6b3dd 100644 --- a/CHANGES.ru +++ b/CHANGES.ru @@ -1,4 +1,11 @@ +Изменения в nginx 0.1.7 12.11.2004 + + *) Исправление: при использовании sendfile, если передаваемый файл + менялся, то мог произойти segmentation fault на FreeBSD; ошибка + появилась в 0.1.2. + + Изменения в nginx 0.1.6 11.11.2004 *) Исправление: при некоторых комбинациях директив location c регулярными diff --git a/src/core/nginx.h b/src/core/nginx.h index a8c5ca1ba..529c43da5 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -8,7 +8,7 @@ #define _NGINX_H_INCLUDED_ -#define NGINX_VER "nginx/0.1.6" +#define NGINX_VER "nginx/0.1.7" #define NGINX_VAR "NGINX" #define NGX_NEWPID_EXT ".newbin" diff --git a/src/http/modules/ngx_http_static_handler.c b/src/http/modules/ngx_http_static_handler.c index 12cf5b39d..4cc0de1c2 100644 --- a/src/http/modules/ngx_http_static_handler.c +++ b/src/http/modules/ngx_http_static_handler.c @@ -530,6 +530,7 @@ static ngx_int_t ngx_http_static_handler(ngx_http_request_t *r) b->file_last = ngx_file_size(&fi); b->file->fd = fd; + b->file->name = name; b->file->log = log; out.buf = b; 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_ */ |