Merge pull request #1656 from chobits/master

Modify some files for release 2.3.4 version.
alibaba · Oct 21, 2022 · 698e179 · 698e179
2 parents 3f5bd79 + b470707
commit 698e179
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/CHANGES.cn b/CHANGES.cn
@@ -1,3 +1,11 @@
+Tengine 2.3.4 [2022-10-18]
+* Feature: 增加新模块ngx_openssl_ntls，以支持NTLS协议 (dongbeiouba)
+* Change: 将ngx_openssl_ntls模块中依赖的SSL库从BabaSSL更新为Tongsuo (wa5i)
+* Bugfix: 修复CVE-2021-23017 (chobits)
+* Bugfix: 修复upstream check模块在upstream配置块中使用zone指令时导致的死锁 (zjd87)
+* Bugfix：修复upstream check编译错误 (RocFang)
+* Bugfix: 修复dubbo编译报错 (MengqiWu)
+
 Tengine 2.3.3 [2021-03-25]
 * Feature: 支持dtlsv1和dtlsv1.2 (mrpre)
 * Feature: ngx_http_upstream_check_module模块增加prometheus格式和json属性 (dkrutsko)

diff --git a/CHANGES.te b/CHANGES.te
@@ -1,3 +1,21 @@
+Changes with Tengine 2.3.4                                         18 Oct 2022
+
+    *) Feature: added new module ngx_openssl_ntls to support NTLS protocol
+       (dongbeiouba)
+
+    *) Change: updated SSL library from BabaSSL to Tongsuo in the
+       ngx_openssl_ntls module (wa5i)
+
+    *) Bugfix: fixed CVE-2021-23017 (chobits)
+
+    *) Bugfix: fixed deadlock in the upstream check module with "zone"
+       directive configured in upstream block (zjd87)
+
+    *) Bugfix：fixed compilation in the upstream check module (RocFang)
+
+    *) Bugfix: fixed compilation error in the dubbo module (MengqiWu)
+
+
 Changes with Tengine 2.3.3                                         25 Mar 2021
 
     *) Feature: tengine supports dtlsv1 and dtlsv1.2. (mrpre)

diff --git a/src/core/nginx.h b/src/core/nginx.h
@@ -14,8 +14,8 @@
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #define TENGINE            "Tengine"
-#define tengine_version    2003003
-#define TENGINE_VERSION    "2.3.3"
+#define tengine_version    2003004
+#define TENGINE_VERSION    "2.3.4"
 #define TENGINE_VER        TENGINE "/" TENGINE_VERSION
 
 #ifdef NGX_BUILD