Mercurial > hg > nginx
comparison src/os/unix/ngx_linux_sendfile_chain.c @ 455:295d97d70c69 release-0.1.2
nginx-0.1.2-RELEASE import
*) Feature: the --user=USER, --group=GROUP, and --with-ld-opt=OPTIONS
options in configure.
*) Feature: the server_name directive supports *.domain.tld.
*) Bugfix: the portability improvements.
*) Bugfix: if configuration file was set in command line, the
reconfiguration was impossible; the bug had appeared in 0.1.1.
*) Bugfix: proxy module may get caught in an endless loop when sendfile
is not used.
*) Bugfix: with sendfile the response was not recoded according to the
charset module directives; the bug had appeared in 0.1.1.
*) Bugfix: very seldom bug in the kqueue processing.
*) Bugfix: the gzip module compressed the proxied responses that was
already compressed.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 21 Oct 2004 15:34:38 +0000 |
parents | 42d11f017717 |
children | a88a3e4e158f |
comparison
equal
deleted
inserted
replaced
454:2ff9cff0f469 | 455:295d97d70c69 |
---|---|
35 ngx_buf_t *file; | 35 ngx_buf_t *file; |
36 ngx_array_t header; | 36 ngx_array_t header; |
37 ngx_event_t *wev; | 37 ngx_event_t *wev; |
38 ngx_chain_t *cl; | 38 ngx_chain_t *cl; |
39 struct iovec *iov, headers[NGX_HEADERS]; | 39 struct iovec *iov, headers[NGX_HEADERS]; |
40 #if (HAVE_SENDFILE64) | 40 #if (NGX_HAVE_SENDFILE64) |
41 off_t offset; | 41 off_t offset; |
42 #else | 42 #else |
43 int32_t offset; | 43 int32_t offset; |
44 #endif | 44 #endif |
45 | 45 |
165 && file->file->fd == cl->buf->file->fd | 165 && file->file->fd == cl->buf->file->fd |
166 && fprev == cl->buf->file_pos); | 166 && fprev == cl->buf->file_pos); |
167 } | 167 } |
168 | 168 |
169 if (file) { | 169 if (file) { |
170 #if (HAVE_SENDFILE64) | 170 #if (NGX_HAVE_SENDFILE64) |
171 offset = file->file_pos; | 171 offset = file->file_pos; |
172 #else | 172 #else |
173 offset = (int32_t) file->file_pos; | 173 offset = (int32_t) file->file_pos; |
174 #endif | 174 #endif |
175 rc = sendfile(c->fd, file->file->fd, &offset, fsize); | 175 rc = sendfile(c->fd, file->file->fd, &offset, fsize); |