summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES6
-rw-r--r--CHANGES.ru6
-rw-r--r--src/core/nginx.h2
-rw-r--r--src/core/ngx_output_chain.c4
-rw-r--r--src/http/modules/perl/nginx.pm2
5 files changed, 16 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index c9f0de357..6f54854d4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
+Changes with nginx 0.7.16 08 Sep 2008
+
+ *) Bugfix: nginx could not be built on 64-bit platforms; the bug had
+ appeared in 0.7.15.
+
+
Changes with nginx 0.7.15 08 Sep 2008
*) Feature: the ngx_http_random_index_module.
diff --git a/CHANGES.ru b/CHANGES.ru
index 390c43a08..3863f4afc 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,10 @@
+Изменения в nginx 0.7.16 08.09.2008
+
+ *) Исправление: nginx не собирался на 64-битных платформах; ошибка
+ появилась в 0.7.15.
+
+
Изменения в nginx 0.7.15 08.09.2008
*) Добавление: модуль ngx_http_random_index_module.
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 61d2e47b1..1111e6ccc 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -8,7 +8,7 @@
#define _NGINX_H_INCLUDED_
-#define NGINX_VERSION "0.7.15"
+#define NGINX_VERSION "0.7.16"
#define NGINX_VER "nginx/" NGINX_VERSION
#define NGINX_VAR "NGINX"
diff --git a/src/core/ngx_output_chain.c b/src/core/ngx_output_chain.c
index e0f615e5b..3d5ae1db5 100644
--- a/src/core/ngx_output_chain.c
+++ b/src/core/ngx_output_chain.c
@@ -331,7 +331,7 @@ ngx_output_chain_align_file_buf(ngx_output_chain_ctx_t *ctx, off_t bsize)
if (size == 0) {
- if (bsize >= ctx->bufs.size) {
+ if (bsize >= (off_t) ctx->bufs.size) {
return NGX_DECLINED;
}
@@ -340,7 +340,7 @@ ngx_output_chain_align_file_buf(ngx_output_chain_ctx_t *ctx, off_t bsize)
} else {
size = 512 - size;
- if (size > bsize) {
+ if ((off_t) size > bsize) {
size = (size_t) bsize;
}
}
diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm
index fc1782abc..d7c0bdfe5 100644
--- a/src/http/modules/perl/nginx.pm
+++ b/src/http/modules/perl/nginx.pm
@@ -47,7 +47,7 @@ our @EXPORT = qw(
HTTP_INSUFFICIENT_STORAGE
);
-our $VERSION = '0.7.15';
+our $VERSION = '0.7.16';
require XSLoader;
XSLoader::load('nginx', $VERSION);