Mercurial > hg > nginx
changeset 465:5aecc125bc33 release-0.1.7
nginx-0.1.7-RELEASE import
*) 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.
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Fri, 12 Nov 2004 14:35:09 +0000 |
| parents | 068e10cadfd3 |
| children | ee6d66462bff |
| files | docs/xml/nginx/changes.xml src/core/nginx.h src/http/modules/ngx_http_static_handler.c src/os/unix/ngx_channel.c src/os/unix/ngx_socket.h |
| diffstat | 5 files changed, 23 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/xml/nginx/changes.xml +++ b/docs/xml/nginx/changes.xml @@ -6,6 +6,24 @@ title="nginx"> +<changes ver="0.1.7" date="12.11.2004"> + +<change type="bugfix"> +<para lang="ru"> +при использовании sendfile, если передаваемый файл менялся, то мог +произойти segmentation fault на FreeBSD; +ошибка появилась в 0.1.2. +</para> +<para lang="en"> +on FreeBSD the segmentation fault may occure if the size of the transferred +file was changed; +bug appeared in 0.1.2. +</para> +</change> + +</changes> + + <changes ver="0.1.6" date="11.11.2004"> <change type="bugfix">
--- 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"
--- 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 b->file_last = ngx_file_size(&fi); b->file->fd = fd; + b->file->name = name; b->file->log = log; out.buf = b;
--- 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_cycl 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"); } }
--- 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_ */