Mercurial > hg > nginx-vendor-current

changeset 408:a2a3905c04ab NGINX_0_7_16

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.7.16 *) Bugfix: nginx could not be built on 64-bit platforms; the bug had appeared in 0.7.15.
author Igor Sysoev <http://sysoev.ru>
date Mon, 08 Sep 2008 00:00:00 +0400
parents 5d65f31d8ec2
children f6561f721532
files CHANGES CHANGES.ru src/core/nginx.h src/core/ngx_output_chain.c src/http/modules/perl/nginx.pm
diffstat 5 files changed, 16 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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.
--- 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"
--- 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_outp
 
     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_outp
     } else {
         size = 512 - size;
 
-        if (size > bsize) {
+        if ((off_t) size > bsize) {
             size = (size_t) bsize;
         }
     }
--- 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);