summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-06-22 09:17:30 +0000
committerJonathan Kolb <jon@b0g.us>2009-06-22 09:17:30 +0000
commit83116b3fea0173c4fdc4993c757869f92fb9d799 (patch)
tree24709295ea6f64d9c673e2d6c39bb9ceef3032e9
parentfb3b1b255e21476d6e6c371cc33b9b4ff51c4355 (diff)
downloadnginx-83116b3fea0173c4fdc4993c757869f92fb9d799.tar.gz
Changes with nginx 0.8.4 22 Jun 2009v0.8.4
*) Bugfix: nginx could not be built --without-http-cache; the bug had appeared in 0.8.3.
-rw-r--r--CHANGES8
-rw-r--r--CHANGES.ru8
-rw-r--r--src/core/nginx.h4
-rw-r--r--src/http/modules/perl/nginx.pm2
-rw-r--r--src/http/ngx_http_upstream.c4
5 files changed, 21 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index 70f2721d6..420722dd8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -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.
diff --git a/CHANGES.ru b/CHANGES.ru
index 4b8b668ff..b5cb0cea4 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -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.
diff --git a/src/core/nginx.h b/src/core/nginx.h
index f63bccc7b..922fa0a53 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -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"
diff --git a/src/http/modules/perl/nginx.pm b/src/http/modules/perl/nginx.pm
index 0dd632a23..3bb73cce1 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.8.3';
+our $VERSION = '0.8.4';
require XSLoader;
XSLoader::load('nginx', $VERSION);
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 16a027a8a..add5b21d9 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -318,10 +318,14 @@ static ngx_http_variable_t ngx_http_upstream_vars[] = {
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 }
};