modify some files for release 2.3.0 version.

Author: wangfakang

CHANGES.cn

@@ -1,3 +1,37 @@
+Tengine 2.3.0 [2019-03-20]
+
+* Feature: 新增proxy_connect模块，可以支持HTTP的CONNECT方法 [chobits]
+* Feature: Stream模块server配置块支持server_name指令 [mrpre]
+* Feature: reqstat模块新增req_status_lazy指令 [taoyuanyuan]
+* Feature: 新增http2指令，可以在server配置块中控制http2开关 [jinjiu]
+* Feature: 新增ssl_handshake_time变量，统计SSL握手时间 [jinjiu]
+* Feature: limit_req_zone指令的rate参数支持变量模式 [Alaaask]
+* Change: 更新debug_pool模块，适配Nginx官方1.15.9 [chobits]
+* Change: 更新reuse_port、dso、limit_req指令使用文档 [chobits、wangfakang]
+* Change: 合并官方limit_req逻辑，当对应key所有的变量值为空才跳过统计 [chobits]
+* Change: 删除reuse_port、dso、slice指令，统一使用Nginx官方对应的功能 [wangfakang]
+* Change: 适配并合并官方1.15.9测试用列 [chobits、wangfakang]
+* Change: 对Tengine自身模块全部剥离到modules目录下，减少对core的入侵 [chobits、wangfakang]
+* Change: 升级合并官方1.15.9代码，并同步官方新功能如Stream、gRPC等 [chobits、wangfakang]
+* Change: 更新Lua模块至v0.10.14rc4 [wangfakang]
+* Change: 更新dyups文档 [lf1029698952]
+* Change: 对core代码的修改全部使用宏区分开 [chobits、wangfakang、fankeke、hongxiaolong、imkeeper]
+* Change: 恢复accpte_filter功能 [wangfakang]
+* Bugfix: 修复dyups模块在和高版本OpenSSL一起编译的报错问题 [wangfakang]
+* Bugfix: 修复dyups模块init_number初始化逻辑 [FengXingYuXin]
+* Bugfix: 修复rollback日志进程在reload时可能导致日志写到滚动后的文件里面 [MengqiWu]
+* Bugfix: 修复ssl_verify_client_exception指令导致的coredump问题 [chobits]
+* Bugfix: 修复dyups、session_sticky模块在升级core代码后导致的coredump问题 [wangfakang]
+* Bugfix: 修复limit_req、http2模块的编译错误 [hongxiaolong]
+* Bugfix: 修复日志pipe进程在关闭监听socket时误删除监听Unix domain文件 [wangfakang]
+* Bugfix: 修复静态加载OpenSSL库时导致async openssl无法检测 [mrpre]
+* Bugfix: 修复ngx_http_top_input_body_filter被删除的问题 [chobits]
+* Bugfix: 修复reuse_port和accept_mutex指令冲突问题 [innomentats]
+* Bugfix: 修复在高版本GCC下的编译报错问题 [wangfakang]
+
+Tengine 2.2.3 [2018-11-11]
+* Security: 修复安全漏洞CVE-2018-16843，CVE-2018-16844和CVE-2018-16845 [chobits]
+
 Tengine 2.2.2 [2018-01-26]
 * Feature: 支持异步OpenSSL，可使用相关硬件(如：QAT)进行SSL的卸载 [mrpre]
 * Feature: 支持TLS1.3，TLS握手0-RTT [jlijian3] 

CHANGES.te

@@ -1,3 +1,59 @@
+Changes with Tengine 2.3.0                                         20 MAR 2019
+
+    *) Feature: added proxy_connect module support for the CONNECT
+       HTTP method. (chobits)
+    *) Feature: added server_name directive for Stream module. (mrpre)
+    *) Feature: added req_status_lazy directive for reqstat module. (taoyuanyuan)
+    *) Feature: added http2 directive to enable or disable http2
+       in the server block. (jinjiu)
+    *) Feature: added $ssl_handshake_time variable used for monitoring
+       SSL handshake time. (jinjiu)
+    *) Feature: added support of variable of limit_req_zone
+       parameter rate. (Alaaask)
+    *) Change: updated debug_pool module for Nginx 1.15.9. (chobits)
+    *) Change: updated documents for reuse_port、dso、limit_req
+       directive changes. (chobits、wangfakang)
+    *) Change: merged the official limit_req logic. Now will ignore statistics
+       when all variable values are empty. (chobits)
+    *) Change: the reuse_port、dso、slice directive has been removed and
+       use the official features of Nginx. (wangfakang)
+    *) Change: updated and modify the official 1.15.9 test cases.
+       (chobits、wangfakang)
+    *) Change: put all Tengine's modules into the modules directory
+       which reduces the intrusion of Nginx's core module. (chobits、wangfakang)
+    *) Change: updated the code from Nginx-1.15.9 version,
+       Stream、gRPC etc. (chobits、wangfakang)
+    *) Change: updated the Lua module to v0.10.14rc4. (wangfakang)
+    *) Change: updated the dyups document. (lf1029698952)
+    *) Change: changes of the core code are all guarded by macros.
+       (chobits、wangfakang、fankeke、hongxiaolong、imkeeper)
+    *) Change: rollback  accpte_filter feature. (wangfakang)
+    *) Bugfix: fixed compilation error of dyups module compiled
+       with a higher version of OpenSSL. (wangfakang)
+    *) Bugfix: fixed init_number initialization for dyups. (FengXingYuXin)
+    *) Bugfix: fixed the rollback log process that may cause logs
+       to be written to a rolled-up file when reloaded. (MengqiWu)
+    *) Bugfix: fixed coredump of referring null pointer
+       for ssl_verify_client_exception. (chobits)
+    *) Bugfix: fixed coredump caused by upgrading core code
+       in dyups and session_sticky modules. (wangfakang)
+    *) Bugfix: fixed compilation error of limit_req、http2 module. (hongxiaolong)
+    *) Bugfix: fixed removes the Unix domain socket file
+       when pipe proc close listen socket. (wangfakang)
+    *) Bugfix: fixed compatibility for --with-openssl
+       and --with-openssl-async. (mrpre)
+    *) Bugfix: fixed bug that function ngx_http_top_intput_body_filter
+       is removed mistakenly. (chobits)
+    *) Bugfix: fixed reuse_port and accept_mutex conflict. (innomentats)
+    *) Bugfix: fixed tengine build failure when compiled with
+       gcc7 compiler. (wangfakang)
+
+
+Changes with Tengine 2.2.3                                         11 Nov 2018
+
+    *) Security: fixed CVE-2018-16843, CVE-2018-16844 and
+       CVE-2018-16845. (chobits)
+
 Changes with Tengine 2.2.2                                         26 Jan 2018
 
     *) Feature: support asynchronous SSL/TLS mode, Could use QAT to

README

@@ -8,7 +8,9 @@ Tengine has been an open source project since December 2011. It is being activel
 
 Features
 --------
-* All features of nginx-1.8.1 are inherited, i.e., it is 100% compatible with nginx.
+* All features of nginx-1.9.15 are inherited, i.e., it is 100% compatible with nginx.
+* Support the CONNECT HTTP method. could be used in forward proxy scenarios.
+* Support asynchronous OpenSSL, using hardware such as QAT for HTTPS acceleration.
 * Dynamic module loading support. You don't need to recompile Tengine when adding new modules to it.
 * HTTP/2 support. The ngx_http_v2_module supersedes the ngx_http_spdy_module module.
 * Sends unbuffered upload directly to HTTP and FastCGI backend servers, which saves disk I/Os.

docs/core.md

@@ -19,6 +19,8 @@ The force_exit support is not enabled by default. You should compile it explicit
  ./configure --with-force-exit
 ```
 
+Note: Removed force_exit directive after the Tengine-2.3.0 version and use Nginx official `worker_shutdown_timeout` , detailed reference [worker_shutdown_timeout](http://nginx.org/en/docs/ngx_core_module.html#worker_shutdown_timeout)
+
 
 ### worker_processes
 

docs/core_cn.md

@@ -17,6 +17,7 @@ force_exit功能默认没有编译开启。需要编译时开启:
 ```
  ./configure --with-force-exit
 ```
+注意：Tengine-2.3.0 版本后废弃force_exit指令,使用Nginx官方`worker_shutdown_timeout`指令替代，详细[文档](http://nginx.org/en/docs/ngx_core_module.html#worker_shutdown_timeout)
 
 
 ### worker_processes

docs/modules/ngx_http_reqstat_module.md

@@ -206,3 +206,14 @@ Define the recycle threshold for a zone. Recycle will be switched on when the sh
 and will only take effect on imformation whose visit frequency is lower than the setting.
 The setting frequency is defined by 'times' and 'seconds', and it is 10r/min by default.
      req_status_zone_recycle demo_zone 10 60;
+
+req_status_lazy
+-------------------------------
+
+**Syntax**: *req_status_lazy on|off*
+
+**Default**: *off*
+
+**Context**: *http、srv、loc*
+
+req_status_lazy directive is used to control whether the variable in the req_status_zone directive is recalculate during the log phasei. In order to solve some variables (such as the upstream_xxx related variable) as a key scene to get empty value.

docs/modules/ngx_http_reqstat_module_cn.md

@@ -192,3 +192,15 @@ req_status_zone_recycle
 定义某个共享内存块过期数据的回收。回收在共享内存耗尽时自动开启。只会回收访问频率低于设置值的监控数据。
 频率定义为 times / seconds，默认值为10r/min，即
      req_status_zone_recycle demo_zone 10 60;
+
+
+req_status_lazy
+-------------------------------
+
+**Syntax**: *req_status_lazy on|off*
+
+**Default**: *off*
+
+**Context**: *http、srv、loc*
+
+req_status_lazy指令用于控制req_status_zone指令中配置的变量是否在log阶段重新取值，用来解决部分变量（如upstream_xxx相关变量）作为key场景下获取是空的问题。

src/core/nginx.h

@@ -20,8 +20,8 @@
 #endif
 
 #define TENGINE            "Tengine"
-#define tengine_version    2002002
-#define TENGINE_VERSION    "2.2.2"
+#define tengine_version    2003000
+#define TENGINE_VERSION    "2.3.0"
 #define TENGINE_VER        TENGINE "/" TENGINE_VERSION
 
 #define NGINX_VAR          "NGINX"