Merge pull request #944 from taoyuanyuan/master

Change log for tengine 2.2.1

CHANGES.cn

@@ -1,3 +1,24 @@
+Tengine 2.2.1 [2017-09-27]
+* Security: Nginx range过滤器整形溢出漏洞(CVE–2017–7529) [hongxiaolong]
+* Feature: 新增ngx_slab_stat模块,获取NGINX/Tengine共享内存池的slab和空闲页状态信 [hongxiaolong]
+* Feature: pipe指令新增rollback参数，可基于时间、文件大小等维度进行日志回滚功能 [MengqiWu]
+* Feature: 新增dns cache功能，可避免dns服务不可用时导致Tengine无法正常启停 [wangfakang]
+* Feature: 新增sysguard_cpu指令，基于cpu保护维度来限制用户的请求 [wangfakang]
+* Change: 更新range filter模块，避免启始位置为负数 [jinjiu]
+* Change: 同步nginx官方1.13.4版本的ngx_slab，避为了启用slab相关统计信息 [hongxiaolong]
+* Change: 更新http2相关测试文件：Nginx.pm和HTTP2.pm [chobits]
+* Change: 更新http2模块，同步nginx官方1.11.6版本http2 [PeterDaveHello]
+* Change: 更新tengine core文档 [chobits]
+* Change: 去掉在OS X系统中废弃使用OpenSSL library时的警告信息 [chobits]
+* Change: 更新travis.yml配置文件 [PeterDaveHello]
+* Bugfix: 修复proxy_upstream_tries，避免lua子请求会多重试一次后端 [wangfakang]
+* Bugfix：修复reuse_port和accept_mutex的冲突 [gwtony]
+* Bugfix：修复reuse_port在worker_processes设置为auto时不生效 [wangfakang]
+* Bugfix: 修复开启reuse_port后执行nginx -t失败问题 [chobits]
+* Bugfix: 修复pipe模块返回值异常情况 [chobits]
+* Bugfix: 修复configure检测报错 [chobits]
+* Bugfix：修复aio选项在freebsd系统中缺少检查的问题 [chobits]
+
 Tengine 2.2.0 [2016-11-29]
 * Security: 进程将特殊构造的请求体写到临时文件时会触发段错误 (CVE-2016-4450) [0x7E]
 * Feature:  增加force_exit指令 [aholic, chobits]

CHANGES.te

@@ -1,3 +1,53 @@
+Changes with Tengine 2.2.1                                         27 Sep 2017
+
+    *) Security: range filter protect from total size overflows.
+       (CVE–2017–7529) (hongxiaolong)
+
+    *) Feature: added ngx_slab_stat module to show shared memory statistics.
+       (hongxiaolong)
+
+    *) Feature: added rollback parameter for pipe to support roll back log file
+       by time or file size. (MengqiWu)
+
+    *) Feature: added dns cache to avoid tengine reload、start or stop etc
+       failed when dns server is unavailable. (wangfakang)
+
+    *) Feature: added sysguard_cpu to protect the system by monitoring
+       the CPU usage. (wangfakang)
+
+    *) Change: Range filter: avoid negative range start. (jinjiu)
+
+    *) Change: updated ngx_slab from nginx-1.13.4 to enable slab slots and
+       free pages statistics. (hongxiaolong)
+
+    *) Change: update test cases: Nginx.pm and HTTP2.pm. (chobits)
+
+    *) Change: HTTP/2 updates from nginx v1.9.8~1.11.6. (PeterDaveHello)
+
+    *) Change: updated core document. (chobits)
+
+    *) Change: remove the warning message when using deprecated system OpenSSL
+       library on OS X. (chobits)
+
+    *) Change: updated travis.yml configure. (PeterDaveHello)
+
+    *) Bugfix: fixed "proxy_upstream_tries" number of retry backend
+       is incorrect for lua subrequest. (wangfakang)
+
+    *) Bugfix: fixed bug reuse_port and accept_mutex conflict. (gwtony)
+
+    *) Bugfix: fixed bug when the worker_processes is set to auto caused
+       reuse_port did not work. (wangfakang)
+
+    *) Bugfix: fixed bug of used reuse_port caused nginx -t failed. (chobits)
+
+    *) Bugfix: fixed bug of check return value of pipe module. (chobits)
+
+    *) Bugfix: fixed check configure error. (chobits)
+
+    *) Bugfix: fixed check aio configure option in auto/os/freebsd. (chobits)
+
+
 Changes with Tengine 2.2.0                                         29 Nov 2016
 
     *) Security: a segmentation fault might occur in a worker process