mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nginx-0.1.7-RELEASE import

Browse Source 
*) 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.
This commit is contained in:
Igor Sysoev 2004-11-12 14:35:09 +00:00
parent 474f1eefb6
commit 7e932d6a50
5 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docs/xml/nginx/changes.xml
View File

@ -6,6 +6,24 @@
title="nginx"> 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"> <changes ver="0.1.6" date="11.11.2004">
<change type="bugfix"> <change type="bugfix">

2
src/core/nginx.h
View File

@ -8,7 +8,7 @@
#define _NGINX_H_INCLUDED_ #define _NGINX_H_INCLUDED_
#define NGINX_VER "nginx/0.1.6" #define NGINX_VER "nginx/0.1.7"
#define NGINX_VAR "NGINX" #define NGINX_VAR "NGINX"
#define NGX_NEWPID_EXT ".newbin" #define NGX_NEWPID_EXT ".newbin"

1
src/http/modules/ngx_http_static_handler.c
View File

@ -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_last = ngx_file_size(&fi);
b->file->fd = fd; b->file->fd = fd;
b->file->name = name;
b->file->log = log; b->file->log = log;
out.buf = b; out.buf = b;

4
src/os/unix/ngx_channel.c
View File

@ -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) void ngx_close_channel(ngx_fd_t *fd, ngx_log_t *log)
{ {
if (close(fd[0]) == -1) { 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) { 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");
} }
} }

2
src/os/unix/ngx_socket.h
View File

@ -54,7 +54,7 @@ int ngx_tcp_push(ngx_socket_t s);
#define ngx_shutdown_socket_n "shutdown()" #define ngx_shutdown_socket_n "shutdown()"
#define ngx_close_socket close #define ngx_close_socket close
#define ngx_close_socket_n "close()" #define ngx_close_socket_n "close() socket"
#endif /* _NGX_SOCKET_H_INCLUDED_ */ #endif /* _NGX_SOCKET_H_INCLUDED_ */