summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2008-03-13 06:11:17 +0000
committerJonathan Kolb <jon@b0g.us>2008-03-13 06:11:17 +0000
commite27edb256803b9d1290c490304e8bc11be886cdb (patch)
tree707f8ee4a74b7e814e3322f786cd88b1220947df
parentae7289106bcf680f72d586197d099b0dff29a753 (diff)
downloadnginx-e27edb256803b9d1290c490304e8bc11be886cdb.tar.gz
Changes with nginx 0.6.28 13 Mar 2008v0.6.28
*) Bugfix: the rtsig method could be not built; bug appeared in 0.6.27.
-rw-r--r--CHANGES5
-rw-r--r--CHANGES.ru5
-rw-r--r--auto/modules6
-rw-r--r--auto/sources6
-rw-r--r--src/core/nginx.h2
-rw-r--r--src/http/modules/perl/nginx.pm2
-rw-r--r--src/os/unix/ngx_linux_config.h2
7 files changed, 19 insertions, 9 deletions
diff --git a/CHANGES b/CHANGES
index 236f430e1..7ddc5fb8b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
+Changes with nginx 0.6.28 13 Mar 2008
+
+ *) Bugfix: the rtsig method could be not built; bug appeared in 0.6.27.
+
+
Changes with nginx 0.6.27 12 Mar 2008
*) Change: now by default the rtsig method is not built on
diff --git a/CHANGES.ru b/CHANGES.ru
index fc3567f93..5bc39246d 100644
--- a/CHANGES.ru
+++ b/CHANGES.ru
@@ -1,4 +1,9 @@
+Изменения в nginx 0.6.28 13.03.2008
+
+ *) Исправление: метод rtsig не собирался; ошибка появилась в 0.6.27.
+
+
Изменения в nginx 0.6.27 12.03.2008
*) Изменение: теперь на Linux 2.6.18+ по умолчанию не собирается метод
diff --git a/auto/modules b/auto/modules
index c9b09aed0..94bd7fba0 100644
--- a/auto/modules
+++ b/auto/modules
@@ -113,7 +113,7 @@ fi
if [ $HTTP_POSTPONE = YES ]; then
HTTP_FILTER_MODULES="$HTTP_FILTER_MODULES $HTTP_POSTPONE_FILTER_MODULE"
- HTTP_SRCS="$HTTP_SRCS $HTPP_POSTPONE_FILTER_SRCS"
+ HTTP_SRCS="$HTTP_SRCS $HTTP_POSTPONE_FILTER_SRCS"
fi
if [ $HTTP_CHARSET = YES ]; then
@@ -278,8 +278,8 @@ fi
# STUB
#USE_MD5=YES
-#HTTP_SRCS="$HTTP_SRCS $HTPP_CACHE_SRCS"
-#HTTP_SRCS="$HTTP_SRCS $HTPP_FILE_CACHE_SRCS"
+#HTTP_SRCS="$HTTP_SRCS $HTTP_CACHE_SRCS"
+#HTTP_SRCS="$HTTP_SRCS $HTTP_FILE_CACHE_SRCS"
if [ $HTTP_STUB_STATUS = YES ]; then
have=NGX_STAT_STUB . auto/have
diff --git a/auto/sources b/auto/sources
index fd0cfd2fa..9c7311eb0 100644
--- a/auto/sources
+++ b/auto/sources
@@ -307,10 +307,10 @@ HTTP_SRCS="src/http/ngx_http.c \
# STUB
HTTP_SRCS="$HTTP_SRCS src/http/ngx_http_busy_lock.c"
-HTPP_POSTPONE_FILTER_SRCS=src/http/ngx_http_postpone_filter_module.c
+HTTP_POSTPONE_FILTER_SRCS=src/http/ngx_http_postpone_filter_module.c
-HTPP_CACHE_SRCS=src/http/ngx_http_cache.c
-HTPP_FILE_CACHE_SRCS=src/http/ngx_http_file_cache.c
+HTTP_CACHE_SRCS=src/http/ngx_http_cache.c
+HTTP_FILE_CACHE_SRCS=src/http/ngx_http_file_cache.c
HTTP_CHARSET_FILTER_MODULE=ngx_http_charset_filter_module
diff --git a/src/core/nginx.h b/src/core/nginx.h
index 0645cc444..c569b68f3 100644
--- a/src/core/nginx.h
+++ b/src/core/nginx.h
@@ -8,7 +8,7 @@
#define _NGINX_H_INCLUDED_
-#define NGINX_VERSION "0.6.27"
+#define NGINX_VERSION "0.6.28"
#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 cd25685a2..77ca6b53c 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.6.27';
+our $VERSION = '0.6.28';
require XSLoader;
XSLoader::load('nginx', $VERSION);
diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h
index c584ff885..cd9350992 100644
--- a/src/os/unix/ngx_linux_config.h
+++ b/src/os/unix/ngx_linux_config.h
@@ -69,7 +69,7 @@ extern ssize_t sendfile(int s, int fd, int32_t *offset, size_t size);
#endif
-#if (NGX_HAVE_POLL)
+#if (NGX_HAVE_POLL || NGX_HAVE_RTSIG)
#include <poll.h>
#endif