changeset 504:c178dbab489a NGINX_0_8_4

nginx 0.8.4 *) Bugfix: nginx could not be built --without-http-cache; the bug had appeared in 0.8.3.
author Igor Sysoev <http://sysoev.ru>
date Mon, 22 Jun 2009 00:00:00 +0400
parents a73427541b68
children 1191e3250e60
files CHANGES CHANGES.ru src/core/nginx.h src/http/modules/perl/nginx.pm src/http/ngx_http_upstream.c
diffstat 5 files changed, 21 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/CHANGES	Fri Jun 19 00:00:00 2009 +0400
+++ b/CHANGES	Mon Jun 22 00:00:00 2009 +0400
@@ -1,5 +1,11 @@
 
-Changes with nginx 0.8.2                                         19 Jun 2009
+Changes with nginx 0.8.4                                         22 Jun 2009
+
+    *) Bugfix: nginx could not be built --without-http-cache; the bug had 
+       appeared in 0.8.3.
+
+
+Changes with nginx 0.8.3                                         19 Jun 2009
 
     *) Feature: the $upstream_cache_status variable.
 
--- a/CHANGES.ru	Fri Jun 19 00:00:00 2009 +0400
+++ b/CHANGES.ru	Mon Jun 22 00:00:00 2009 +0400
@@ -1,5 +1,11 @@
 
-Изменения в nginx 0.8.2                                           19.06.2009
+Изменения в nginx 0.8.4                                           22.06.2009
+
+    *) Исправление: nginx не собирался с параметром --without-http-cache; 
+       ошибка появилась в 0.8.3.
+
+
+Изменения в nginx 0.8.3                                           19.06.2009
 
     *) Добавление: переменная $upstream_cache_status.
 
--- a/src/core/nginx.h	Fri Jun 19 00:00:00 2009 +0400
+++ b/src/core/nginx.h	Mon Jun 22 00:00:00 2009 +0400
@@ -8,8 +8,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version         8003
-#define NGINX_VERSION      "0.8.3"
+#define nginx_version         8004
+#define NGINX_VERSION      "0.8.4"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #define NGINX_VAR          "NGINX"
--- a/src/http/modules/perl/nginx.pm	Fri Jun 19 00:00:00 2009 +0400
+++ b/src/http/modules/perl/nginx.pm	Mon Jun 22 00:00:00 2009 +0400
@@ -47,7 +47,7 @@
     HTTP_INSUFFICIENT_STORAGE
 );
 
-our $VERSION = '0.8.3';
+our $VERSION = '0.8.4';
 
 require XSLoader;
 XSLoader::load('nginx', $VERSION);
--- a/src/http/ngx_http_upstream.c	Fri Jun 19 00:00:00 2009 +0400
+++ b/src/http/ngx_http_upstream.c	Mon Jun 22 00:00:00 2009 +0400
@@ -318,10 +318,14 @@
       ngx_http_upstream_response_length_variable, 0,
       NGX_HTTP_VAR_NOHASH|NGX_HTTP_VAR_NOCACHEABLE, 0 },
 
+#if (NGX_HTTP_CACHE)
+
     { ngx_string("upstream_cache_status"), NULL,
       ngx_http_upstream_cache_status, 0,
       NGX_HTTP_VAR_NOHASH|NGX_HTTP_VAR_NOCACHEABLE, 0 },
 
+#endif
+
     { ngx_null_string, NULL, NULL, 0, 0, 0 }
 };