# HG changeset patch
# User Igor Sysoev <http://sysoev.ru>
# Date 1100206800 -10800
# Node ID 8a529698ed55ff2861d17ae76a12e820e1371d60
# Parent  6bf8a3012a54ff37ef7787e3ead95353d621e1b5
nginx 0.1.7

    *) Bugfix: on FreeBSD the segmentation fault may occur if the size of
       the transferred file was changed; bug appeared in 0.1.5.

diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+
+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
 
diff --git a/CHANGES.ru b/CHANGES.ru
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,3 +1,10 @@
+
+Изменения в nginx 0.1.7                                           12.11.2004
+
+    *) Исправление: при использовании sendfile, если передаваемый файл 
+       менялся, то мог произойти segmentation fault на FreeBSD; ошибка 
+       появилась в 0.1.2.
+
 
 Изменения в nginx 0.1.6                                           11.11.2004
 
diff --git a/src/core/nginx.h b/src/core/nginx.h
--- 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
--- 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;
diff --git a/src/os/unix/ngx_channel.c b/src/os/unix/ngx_channel.c
--- 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");
     }
 }
diff --git a/src/os/unix/ngx_socket.h b/src/os/unix/ngx_socket.h
--- 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_ */