Merge pull request #1000 from wangfakang/tengine-release-2_2_2

update version and changelog for release Tengine-2.2.2
alibaba · Jan 26, 2018 · b122baa · b122baa
2 parents 804cdcb + e7db25e
commit b122baa
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/CHANGES.cn b/CHANGES.cn
@@ -1,3 +1,14 @@
+Tengine 2.2.2 [2018-01-26]
+* Feature: 支持异步OpenSSL，可使用相关硬件(如：QAT)进行SSL的卸载 [mrpre]
+* Feature: 支持TLS1.3，TLS握手0-RTT [jlijian3] 
+* Feature: upstream配置块里面支持include指令 [wangfakang] 
+* Change：更新并修复测试用例 [wangfakang]
+* Change: 恢复ssl_verify_client_exception指令 [jinjiu]  
+* Change: 更新Debian相关软件包版本号 [PeterDaveHello]
+* Change: 更新README文档 [taoyuanyuan]
+* Bugfix: 修复upstream_check模块在reload时可能触发段错误 [yongjianchn]
+* Bugfix: 修复pipe模块在FreeBSD系统中编译报错问题 [MengqiWu]
+
 Tengine 2.2.1 [2017-09-27]
 * Security: Nginx range过滤器整形溢出漏洞(CVE–2017–7529) [hongxiaolong]
 * Feature: 新增ngx_slab_stat模块，可获取NGINX/Tengine共享内存池的slab和空闲页状态信 [hongxiaolong]

diff --git a/CHANGES.te b/CHANGES.te
@@ -1,3 +1,27 @@
+Changes with Tengine 2.2.2                                         26 Jan 2018
+
+    *) Feature: support asynchronous SSL/TLS mode, Could use QAT to
+       offload and accelerated SSL. (mrpre)
+
+    *) Feature: support TLS1.3 and 0-RTT data. (jlijian3) 
+
+    *) Feature: enabled "include" inside http upstreams. (wangfakang)
+
+    *) Change: update and fixed the test cases. (wangfakang)
+
+    *) Change: restore the functionality of the ssl_verify_client_exception
+       directive. (jinjiu)
+
+    *) Change: updated the Debian package version number. (PeterDaveHello)
+
+    *) Change: updated README document. (taoyuanyuan)
+
+    *) Bugfix: fixed bug that the upstream_check module could trigger a segment
+       while reload. (yongjianchn)
+
+    *) Bugfix: fixed compiler error for pipe module on FreeBSD. (MengqiWu)
+
+
 Changes with Tengine 2.2.1                                         27 Sep 2017
 
     *) Security: range filter protect from total size overflows.

diff --git a/src/core/nginx.h b/src/core/nginx.h
@@ -20,8 +20,8 @@
 #endif
 
 #define TENGINE            "Tengine"
-#define tengine_version    2002001
-#define TENGINE_VERSION    "2.2.1"
+#define tengine_version    2002002
+#define TENGINE_VERSION    "2.2.2"
 #define TENGINE_VER        TENGINE "/" TENGINE_VERSION
 
 #define NGINX_VAR          "NGINX"