Merge pull request #249 from yaoweibin/tengine-1.4.6

released Tengine-1.4.6

CHANGES

@@ -1,4 +1,11 @@
 
+Changes with nginx 1.2.9                                         13 May 2013
+
+    *) Security: contents of worker process memory might be sent to a client
+       if HTTP backend returned specially crafted response (CVE-2013-2070);
+       the bug had appeared in 1.1.4.
+
+
 Changes with nginx 1.2.8                                         02 Apr 2013
 
     *) Bugfix: new sessions were not always stored if the "ssl_session_cache

CHANGES.cn

@@ -1,4 +1,7 @@
 
+Tengine-1.4.6 [2013-05-14]
+* Bugifx：合并nginx-1.2.9的更新，修正CVE-2013-2070带来的安全问题。该安全问题在1.4.0以后开始出现 [yaoweibin]
+
 Tengine-1.4.5 [2013-05-01]
 * Feature：增加一致性hash模块，可以为后端服务器提供一致性hash的负载均衡方法 [dinic]
 * Feature：通过keepalive_timeout指令可以设置后端keepalive连接的超时时间 [jinglong]

CHANGES.ru

@@ -1,4 +1,11 @@
 
+Изменения в nginx 1.2.9                                           13.05.2013
+
+    *) Безопасность: содержимое памяти рабочего процесса могло быть
+       отправлено клиенту, если HTTP-бэкенд возвращал специально созданный
+       ответ (CVE-2013-2070); ошибка появилась в 1.1.4.
+
+
 Изменения в nginx 1.2.8                                           02.04.2013
 
     *) Исправление: при использовании директивы "ssl_session_cache shared"

CHANGES.te

@@ -1,4 +1,9 @@
 
+Changes with Tengine 1.4.6                                       14 May 2013
+
+    *) Bugfix: merged the changes of Nginx-1.2.9 and fixed the security problem
+       CVE-2013-2070. This bug had appeared in 1.4.0. (yaoweibin)
+
 Changes with Tengine 1.4.5                                       1 May 2013
 
     *) Feature: added the consistent_hash module which dispatches requests

README

@@ -8,7 +8,7 @@ Tengine has been an open source project since December 2011. It is being activel
 
 Features
 --------
-* All features of nginx-1.2.8 are inherited, i.e. it is 100% compatible with nginx.
+* All features of nginx-1.2.9 are inherited, i.e. it is 100% compatible with nginx.
 * Dynamic module loading support. You don't need to recompile Tengine when adding new modules to it.
 * More load balancing methods, e.g. consistent hashing, session persistence.
 * Input body filter support. It's quite handy to write Web Application Firewalls by using this mechanism.

README.markdown

@@ -9,7 +9,7 @@ Tengine has been an open source project since December 2011. It is being activel
 Features
 ========
 
-* All features of nginx-1.2.8 are inherited, i.e. it is 100% compatible with nginx.
+* All features of nginx-1.2.9 are inherited, i.e. it is 100% compatible with nginx.
 * Dynamic module loading support. You don't need to recompile Tengine when adding new modules to it.
 * More load balancing methods, e.g. consistent hashing, session persistence.
 * Input body filter support. It's quite handy to write Web Application Firewalls by using this mechanism.

docs/modules/ngx_http_upstream_consistent_hash_module_cn.md

@@ -42,9 +42,9 @@
         upstream test {
             consistent_hash $request_uri;
 
-            server 127.0.0.1:9001 id=1001 wegiht=3;
-            server 127.0.0.1:9002 id=1002 wegiht=10;
-            server 127.0.0.1:9003 id=1003 wegiht=20;
+            server 127.0.0.1:9001 id=1001 weight=3;
+            server 127.0.0.1:9002 id=1002 weight=10;
+            server 127.0.0.1:9003 id=1003 weight=20;
         }
     }
 

src/core/nginx.h

@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1002008
-#define NGINX_VERSION      "1.2.8"
+#define nginx_version      1002009
+#define NGINX_VERSION      "1.2.9"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #define tengine_version    1004006

src/http/modules/perl/nginx.pm

@@ -50,7 +50,7 @@ our @EXPORT = qw(
     HTTP_INSUFFICIENT_STORAGE
 );
 
-our $VERSION = '1.2.8';
+our $VERSION = '1.2.9';
 
 require XSLoader;
 XSLoader::load('nginx', $VERSION);