aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_output_chain.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2005-05-23 12:07:45 +0000
committerIgor Sysoev <igor@sysoev.ru>2005-05-23 12:07:45 +0000
commit4959ec482e14884e6c132ed0533c6d62bcc89405 (patch)
tree1993d130e544b3672fb4e612f805aaa8af140566 /src/core/ngx_output_chain.c
parentdebb8a42db100ed27e92cd8126b93844c8f9b3a8 (diff)
downloadnginx-4959ec482e14884e6c132ed0533c6d62bcc89405.tar.gz
nginx-4959ec482e14884e6c132ed0533c6d62bcc89405.zip
nginx-0.1.33-RELEASE importrelease-0.1.33
*) Bugfix: nginx could not be built with the --without-pcre parameter; the bug had appeared in 0.1.29. *) Bugfix: 3, 4, 7, and 8 the "proxy_set_header" directives in one level cause the bus fault on start up. *) Bugfix: the HTTP protocol was specified in the HTTPS redirects. *) Bugfix: if the "rewrite" directive used the captures inside the "if" directive, then the 500 error code was returned.
Diffstat (limited to 'src/core/ngx_output_chain.c')
-rw-r--r--src/core/ngx_output_chain.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c
index e4a8723b2..1e7229114 100644
--- a/src/core/ngx_output_chain.c
+++ b/src/core/ngx_output_chain.c
@@ -381,12 +381,12 @@ ngx_output_chain_copy_buf(ngx_buf_t *dst, ngx_buf_t *src, ngx_uint_t sendfile)
n = ngx_read_file(src->file, dst->pos, (size_t) size, src->file_pos);
if (n == NGX_ERROR) {
- return n;
+ return (ngx_int_t) n;
}
#if (NGX_FILE_AIO_READ)
if (n == NGX_AGAIN) {
- return n;
+ return (ngx_int_t) n;
}
#endif