Skip to content

Commit 760d348

Browse files
authored
Merge pull request #1219 from wangfakang/master
Update some files for release 2.3.0 version.
2 parents c9115ab + d0e0278 commit 760d348

File tree

4 files changed

+22
-77
lines changed

4 files changed

+22
-77
lines changed

CHANGES.cn

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Tengine 2.3.0 [2019-03-20]
1+
Tengine 2.3.0 [2019-03-25]
22

33
* Feature: 新增proxy_connect模块,可以支持HTTP的CONNECT方法 [chobits]
44
* Feature: Stream模块server配置块支持server_name指令 [mrpre]
@@ -7,15 +7,15 @@ Tengine 2.3.0 [2019-03-20]
77
* Feature: 新增ssl_handshake_time变量,统计SSL握手时间 [jinjiu]
88
* Feature: limit_req_zone指令的rate参数支持变量模式 [Alaaask]
99
* Change: 更新debug_pool模块,适配Nginx官方1.15.9 [chobits]
10-
* Change: 更新reuse_port、dso、limit_req指令使用文档 [chobitswangfakang]
10+
* Change: 更新reuse_port、dso、limit_req指令使用文档 [chobits, wangfakang]
1111
* Change: 合并官方limit_req逻辑,当对应key所有的变量值为空才跳过统计 [chobits]
1212
* Change: 删除reuse_port、dso、slice指令,统一使用Nginx官方对应的功能 [wangfakang]
13-
* Change: 适配并合并官方1.15.9测试用列 [chobitswangfakang]
14-
* Change: 对Tengine自身模块全部剥离到modules目录下,减少对core的入侵 [chobitswangfakang]
15-
* Change: 升级合并官方1.15.9代码,并同步官方新功能如Stream、gRPC等 [chobitswangfakang]
13+
* Change: 适配并合并官方1.15.9测试用列 [chobits, wangfakang]
14+
* Change: 对Tengine自身模块全部剥离到modules目录下,减少对core的入侵 [chobits, wangfakang]
15+
* Change: 升级合并官方1.15.9代码,并同步官方新功能如Stream、gRPC等 [chobits, wangfakang]
1616
* Change: 更新Lua模块至v0.10.14rc4 [wangfakang]
1717
* Change: 更新dyups文档 [lf1029698952]
18-
* Change: 对core代码的修改全部使用宏区分开 [chobitswangfakangfankekehongxiaolongimkeeper]
18+
* Change: 对core代码的修改全部使用宏区分开 [chobits, wangfakang, fankeke, hongxiaolong, imkeeper]
1919
* Change: 恢复accpte_filter功能 [wangfakang]
2020
* Bugfix: 修复dyups模块在和高版本OpenSSL一起编译的报错问题 [wangfakang]
2121
* Bugfix: 修复dyups模块init_number初始化逻辑 [FengXingYuXin]
@@ -151,7 +151,7 @@ Tengine 2.0.1 [2014-03-06]
151151

152152
Tengine 2.0.0 [2014-01-08]
153153
* Feature: 增强DSO模块,编译动态模块不再依赖原始编译环境 [monadbobo]
154-
* Feature: 支持SPDY v3协议,自动检测同一端口的SPDY请求和HTTP请求 [lilbedwinchobits]
154+
* Feature: 支持SPDY v3协议,自动检测同一端口的SPDY请求和HTTP请求 [lilbedwin, chobits]
155155
* Feature: 支持设置proxy、memcached、fastcgi、scgi、uwsgi在后端失败时的重试次数 [supertcy]
156156
* Feature: tfs模块在RcServer心跳时汇报访问统计 [zhcn381]
157157
* Feature: if指令支持比较数值大小:'>'、'<'、'>='、'<=' [flygoast]

CHANGES.te

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Changes with Tengine 2.3.0 20 MAR 2019
1+
Changes with Tengine 2.3.0 25 MAR 2019
22

33
*) Feature: added proxy_connect module support for the CONNECT
44
HTTP method. (chobits)
@@ -11,22 +11,22 @@ Changes with Tengine 2.3.0 20 MAR 2019
1111
*) Feature: added support of variable of limit_req_zone
1212
parameter rate. (Alaaask)
1313
*) Change: updated debug_pool module for Nginx 1.15.9. (chobits)
14-
*) Change: updated documents for reuse_portdsolimit_req
15-
directive changes. (chobitswangfakang)
14+
*) Change: updated documents for reuse_port, dso, limit_req
15+
directive changes. (chobits, wangfakang)
1616
*) Change: merged the official limit_req logic. Now will ignore statistics
1717
when all variable values are empty. (chobits)
18-
*) Change: the reuse_portdsoslice directive has been removed and
18+
*) Change: the reuse_port, dso, slice directive has been removed and
1919
use the official features of Nginx. (wangfakang)
2020
*) Change: updated and modify the official 1.15.9 test cases.
21-
(chobitswangfakang)
21+
(chobits, wangfakang)
2222
*) Change: put all Tengine's modules into the modules directory
23-
which reduces the intrusion of Nginx's core module. (chobitswangfakang)
23+
which reduces the intrusion of Nginx's core module. (chobits, wangfakang)
2424
*) Change: updated the code from Nginx-1.15.9 version,
25-
StreamgRPC etc. (chobitswangfakang)
25+
Stream, gRPC etc. (chobits, wangfakang)
2626
*) Change: updated the Lua module to v0.10.14rc4. (wangfakang)
2727
*) Change: updated the dyups document. (lf1029698952)
2828
*) Change: changes of the core code are all guarded by macros.
29-
(chobitswangfakangfankekehongxiaolongimkeeper)
29+
(chobits, wangfakang, fankeke, hongxiaolong, imkeeper)
3030
*) Change: rollback accpte_filter feature. (wangfakang)
3131
*) Bugfix: fixed compilation error of dyups module compiled
3232
with a higher version of OpenSSL. (wangfakang)
@@ -37,7 +37,7 @@ Changes with Tengine 2.3.0 20 MAR 2019
3737
for ssl_verify_client_exception. (chobits)
3838
*) Bugfix: fixed coredump caused by upgrading core code
3939
in dyups and session_sticky modules. (wangfakang)
40-
*) Bugfix: fixed compilation error of limit_reqhttp2 module. (hongxiaolong)
40+
*) Bugfix: fixed compilation error of limit_req, http2 module. (hongxiaolong)
4141
*) Bugfix: fixed removes the Unix domain socket file
4242
when pipe proc close listen socket. (wangfakang)
4343
*) Bugfix: fixed compatibility for --with-openssl
@@ -326,7 +326,7 @@ Changes with Tengine 2.0.0 08 Jan 2014
326326
compiler options when compiling a new module. (monadbobo)
327327

328328
*) Feature: added support for SPDY v3, and SPDY/HTTP servers can listen on
329-
the same port. (lilbedwinchobits)
329+
the same port. (lilbedwin, chobits)
330330

331331
*) Feature: added support for setting retries for upstream servers (proxy,
332332
memcached, fastcgi, scgi, uwsgi). (supertcy)

README

-56
This file was deleted.

README.markdown

+5-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@ Tengine has been an open source project since December 2011. It is being activel
99
Features
1010
========
1111

12-
* All features of nginx-1.8.1 are inherited, i.e., it is 100% compatible with nginx.
13-
* Dynamic module loading support. You don't need to recompile Tengine when adding new modules to it.
14-
* HTTP/2 support. The ngx_http_v2_module supersedes the ngx_http_spdy_module module.
15-
* Sends unbuffered upload directly to HTTP and FastCGI backend servers, which saves disk I/Os.
12+
* All features of nginx-1.15.9 are inherited, i.e., it is 100% compatible with nginx.
13+
* Support the CONNECT HTTP method for forward proxy.
14+
* Support asynchronous OpenSSL, using hardware such as QAT for HTTPS acceleration.
15+
* Enhanced operations monitoring, such as asynchronous log & rollback, DNS caching, memory usage, etc.
16+
* Support server_name in Stream modlue.
1617
* More load balancing methods, e.g., consistent hashing, and session persistence.
1718
* Input body filter support. It's quite handy to write Web Application Firewalls using this mechanism.
1819
* Dynamic scripting language (Lua) support, which is very efficient and makes it easy to extend core functionalities.

0 commit comments

Comments
 (0)