Merge pull request #1543 from lianglli/master

Update some files for release tengine-2.3.3.
alibaba · Mar 29, 2021 · ae3ff46 · ae3ff46
2 parents 5b6f78c + 679dc10
commit ae3ff46
Show file tree

Hide file tree

Showing 6 changed files with 292 additions and 17 deletions.
diff --git a/AUTHORS.te b/AUTHORS.te
@@ -18,3 +18,4 @@ Weibin Yao (wenjing.ywb [at] taobao [dot] com)
 Zhang "agentzh" Yichun (agentzh [at] gmail [dot] com)
 Lanshun Zhou (zls.sogou [at] gmail [dot] com)
 Joshua Zhu (shudu [at] taobao [dot] com)
+Liang Li (lianglli [at] taobao [dot] com)
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,124 @@
+Changes with nginx 1.18.0                                        21 Apr 2020
+
+    *) 1.18.x stable branch.
+
+
+Changes with nginx 1.17.10                                       14 Apr 2020
+
+    *) Feature: the "auth_delay" directive.
+
+
+Changes with nginx 1.17.9                                        03 Mar 2020
+
+    *) Change: now nginx does not allow several "Host" request header lines.
+
+    *) Bugfix: nginx ignored additional "Transfer-Encoding" request header
+       lines.
+
+    *) Bugfix: socket leak when using HTTP/2.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if OCSP
+       stapling was used.
+
+    *) Bugfix: in the ngx_http_mp4_module.
+
+    *) Bugfix: nginx used status code 494 instead of 400 if errors with code
+       494 were redirected with the "error_page" directive.
+
+    *) Bugfix: socket leak when using subrequests in the njs module and the
+       "aio" directive.
+
+
+Changes with nginx 1.17.8                                        21 Jan 2020
+
+    *) Feature: variables support in the "grpc_pass" directive.
+
+    *) Bugfix: a timeout might occur while handling pipelined requests in an
+       SSL connection; the bug had appeared in 1.17.5.
+
+    *) Bugfix: in the "debug_points" directive when using HTTP/2.
+       Thanks to Daniil Bondarev.
+
+
+Changes with nginx 1.17.7                                        24 Dec 2019
+
+    *) Bugfix: a segmentation fault might occur on start or during
+       reconfiguration if the "rewrite" directive with an empty replacement
+       string was used in the configuration.
+
+    *) Bugfix: a segmentation fault might occur in a worker process if the
+       "break" directive was used with the "alias" directive or with the
+       "proxy_pass" directive with a URI.
+
+    *) Bugfix: the "Location" response header line might contain garbage if
+       the request URI was rewritten to the one containing a null character.
+
+    *) Bugfix: requests with bodies were handled incorrectly when returning
+       redirections with the "error_page" directive; the bug had appeared in
+       0.7.12.
+
+    *) Bugfix: socket leak when using HTTP/2.
+
+    *) Bugfix: a timeout might occur while handling pipelined requests in an
+       SSL connection; the bug had appeared in 1.17.5.
+
+    *) Bugfix: in the ngx_http_dav_module.
+
+
+Changes with nginx 1.17.6                                        19 Nov 2019
+
+    *) Feature: the $proxy_protocol_server_addr and
+       $proxy_protocol_server_port variables.
+
+    *) Feature: the "limit_conn_dry_run" directive.
+
+    *) Feature: the $limit_req_status and $limit_conn_status variables.
+
+
+Changes with nginx 1.17.5                                        22 Oct 2019
+
+    *) Feature: now nginx uses ioctl(FIONREAD), if available, to avoid
+       reading from a fast connection for a long time.
+
+    *) Bugfix: incomplete escaped characters at the end of the request URI
+       were ignored.
+
+    *) Bugfix: "/." and "/.." at the end of the request URI were not
+       normalized.
+
+    *) Bugfix: in the "merge_slashes" directive.
+
+    *) Bugfix: in the "ignore_invalid_headers" directive.
+       Thanks to Alan Kemp.
+
+    *) Bugfix: nginx could not be built with MinGW-w64 gcc 8.1 or newer.
+
+
+Changes with nginx 1.17.4                                        24 Sep 2019
+
+    *) Change: better detection of incorrect client behavior in HTTP/2.
+
+    *) Change: in handling of not fully read client request body when
+       returning errors in HTTP/2.
+
+    *) Bugfix: the "worker_shutdown_timeout" directive might not work when
+       using HTTP/2.
+
+    *) Bugfix: a segmentation fault might occur in a worker process when
+       using HTTP/2 and the "proxy_request_buffering" directive.
+
+    *) Bugfix: the ECONNABORTED error log level was "crit" instead of
+       "error" on Windows when using SSL.
+
+    *) Bugfix: nginx ignored extra data when using chunked transfer
+       encoding.
+
+    *) Bugfix: nginx always returned the 500 error if the "return" directive
+       was used and an error occurred during reading client request body.
+
+    *) Bugfix: in memory allocation error handling.
+
+
 Changes with nginx 1.17.3                                        13 Aug 2019
 
     *) Security: when using HTTP/2 a client might cause excessive memory

diff --git a/CHANGES.cn b/CHANGES.cn
@@ -1,5 +1,27 @@
-Tengine 2.3.2 [2019-08-20]
+Tengine 2.3.3 [2021-03-25]
+* Feature: 支持dtlsv1和dtlsv1.2 (mrpre)
+* Feature: ngx_http_upstream_check_module模块增加prometheus格式和json属性 (dkrutsko)
+* Feature: mod_dubbo模块支持dubbo_pass中使用变量 (spacewander)
+* Change: 升级core代码版本到Nginx-1.18.0 (lianglli)
+* Change: 文档README增加Tengine钉钉群号 (cnmade)
+* Change: 更新mod_dubbo模块的说明文档 (spacewander)
+* Bugfix: 修复mod_dubbo模块解码int32错误的问题 (spacewander)
+* Bugfix: 修复mod_dubbo模块解码整型payload出现core dump的问题(spacewander)
+* Bugfix: 修复ngx_http_lua_module模块在debug日志级别下的内存泄漏问题 (hawkxiang)
+* Bugfix: 修复ngx_multi_upstream_module模块未释放fake请求的问题 (spacewander)
+* Bugfix: 修复ngx_http_upstream_check_module模块中的共享内存互斥锁问题 (scriptkids)
+* Bugfix: 去除ngx_http_upstream_check_module模块中冗余的健康检查 (scriptkids)
+* Bugfix: 删除ngx_multi_upstream_module模块日志相关的重复代码 (spacewander)
+* Bugfix: 修复ngx_http_upstream_dyups_module读消息且打开健康检查导致CPU负载过高的问题 (zjd87)
+* Bugfix: 修复ngx_http_upstream_vnswrr_module不支持dynamic_resolve指令的问题 (wangfakang)
+* Bugfix: 修复limit_req_zone指令在多个变量中使用的问题 (wangfakang)
+* Bugfix: 修复master进程偶现core dump问题 (wangfakang)
+* Bugfix: 修复rewrite字符串含'\0'引起的内存泄漏问题 (hongxiaolong)
+* Bugfix: 删除mod_dubbo模块未使用的变量hex_str (Weiliang-Li)
+* Bugfix: 修复keep-alive请求未发送完整导致400错误响应的问题 (fishgege)
+
 
+Tengine 2.3.2 [2019-08-20]
 * Security: 修复HTTP2安全漏洞CVE-2019-9511, CVE-2019-9513和CVE-2019-9516 (wangfakang)
 * Feature: 支持后端Dubbo协议 (MenqqiWu)
 * Feature: upstream支持VNSWRR高效负载均衡算法 (wangfakang)
@@ -12,8 +34,8 @@ Tengine 2.3.2 [2019-08-20]
 * Bugfix: 修复ngx-lua模块在init_worker_by_lua*指令下的问题 (wangfakang)
 * Bugfix: 修复dyups模块与OpenSSL兼容性问题 (wangfakang)
 
-Tengine 2.3.1 [2019-06-18]
 
+Tengine 2.3.1 [2019-06-18]
 * Feature: stream ssl模块新增$ssl_handshakd_time变量 [mrpre]
 * Feature: upstream check模块支持websocket健康检查 (mrpre)
 * Change: round robin负载均衡算法采用随机起点 (wangfakang)
@@ -26,13 +48,13 @@ Tengine 2.3.1 [2019-06-18]
 * Change: 支持footer模块的dso编译 (wangfakang)
 * Change: 支持user_agent模块的dso编译 (wangfakang)
 * Change: 支持concat模块的dso编译 (mathieu-aubin)
-* Fix: 修复部分服务端返回的HTTP头部服务端版本信息  (AstroProfundis)
-* Fix: 修复"-m"参数显示dynamic module的问题 (wangfakang)
-* Fix：修复limit_req指令的参数检查 (wangfakang)
-* Fix: 修复reqstatus在macOS下的兼容性问题 (chobits)
+* Bugfix: 修复部分服务端返回的HTTP头部服务端版本信息  (AstroProfundis)
+* Bugfix: 修复"-m"参数显示dynamic module的问题 (wangfakang)
+* Bugfix: 修复limit_req指令的参数检查 (wangfakang)
+* Bugfix: 修复reqstatus在macOS下的兼容性问题 (chobits)
 
-Tengine 2.3.0 [2019-03-25]
 
+Tengine 2.3.0 [2019-03-25]
 * Feature: 新增proxy_connect模块，可以支持HTTP的CONNECT方法 [chobits]
 * Feature: Stream模块server配置块支持server_name指令 [mrpre]
 * Feature: reqstat模块新增req_status_lazy指令 [taoyuanyuan]
@@ -62,9 +84,11 @@ Tengine 2.3.0 [2019-03-25]
 * 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] 
@@ -76,6 +100,7 @@ Tengine 2.2.2 [2018-01-26]
 * 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]
@@ -97,6 +122,7 @@ Tengine 2.2.1 [2017-09-27]
 * Bugfix: 修复configure检测报错 [chobits]
 * Bugfix：修复aio选项在freebsd系统中缺少检查的问题 [chobits]
 
+
 Tengine 2.2.0 [2016-11-29]
 * Security: 进程将特殊构造的请求体写到临时文件时会触发段错误 (CVE-2016-4450) [0x7E]
 * Feature:  增加force_exit指令 [aholic, chobits]
@@ -118,6 +144,7 @@ Tengine 2.2.0 [2016-11-29]
 * Bugfix:   修复健康检查模块中含有重复peers的bug [FqqCS, taoyuanyuan]
 * Bugfix:   修复concat模块中错误的javascript内容类型 [IYism]
 
+
 Tengine 2.1.1 [2015-08-12]
 * Feature: 支持动态upstream更新 [yzprofile]
 * Feature: 增强ngx_http_reqstat_module模块 [cfsego]
@@ -133,6 +160,7 @@ Tengine 2.1.1 [2015-08-12]
 * Bugfix:  SPDY和SSL模块一起编译时报错 [ym]
 * Bugfix:  修复打开reuseport的bug [monadbobo]
 
+
 Tengine 2.1.0 [2014-12-19]
 * Feature: 支持SO_REUSEPORT选项，以提升CPU负载均衡性和性能 [monadbobo]
 * Feature: 支持动态解析upstream中出现的域名 [InfoHunter]
@@ -155,6 +183,7 @@ Tengine 2.1.0 [2014-12-19]
 * Bugfix: 解析/etc/resolv.conf中的IPv6地址出错 [lifeibo]
 * Bugfix: 通过红黑树查找到错误的upstream [taoyuanyuan]
 
+
 Tengine 2.0.3 [2014-05-30]
 * Feature: 支持按指定维度(域名，url等)收集Tengine运行状态 [cfsego]
 * Feature: 支持debian、ubuntu打包 [betetrpm, szepeviktor]
@@ -165,10 +194,12 @@ Tengine 2.0.3 [2014-05-30]
 * Bugfix: 修复DSO编译和安装模块的问题 [cfsego]
 * Bugfix: 修复spdy相关问题 [chobits]
 
+
 Tengine 2.0.2 [2014-03-28]
 * Bugfix: 在读事件处理完后继续发送SPDY数据 [chobits]
 * Bugfix: CVE-2014-0133以及CVE-2014-0088 [chobits]
 
+
 Tengine 2.0.1 [2014-03-06]
 * Feature: 请求体不缓存的机制支持chunked输入 [yaoweibin]
 * Feature: trim模块支持更多规则，支持根据变量启用 [taoyuanyuan]
@@ -182,6 +213,7 @@ Tengine 2.0.1 [2014-03-06]
 * Bugfix: 减少nginx处理大文件时的内存消耗 [cfsego]
 * Bugfix: 在未设置URI时，禁用跳转到named locations的重定向
 
+
 Tengine 2.0.0 [2014-01-08]
 * Feature: 增强DSO模块，编译动态模块不再依赖原始编译环境 [monadbobo]
 * Feature: 支持SPDY v3协议，自动检测同一端口的SPDY请求和HTTP请求 [lilbedwin, chobits]
@@ -205,11 +237,13 @@ Tengine 2.0.0 [2014-01-08]
 * Bugfix: 修正client_body_postpone_size指令设置为0时出现的问题 [yaoweibin]
 * Bugfix: 修正Lua模块编译时出现警告 [diwayou]
 
+
 Tengine-1.5.2 [2013-11-22]
 * Security: 修复CVE-2013-4547安全漏洞
 * Bugfix: 修复limit_req模块中nodelay无效的问题 [cfsego]
 * Bugfix: 修复trim模块在替换javascript异常的问题 [taoyuanyuan]
 
+
 Tengine-1.5.1 [2013-08-29]
 * Feature: 增加retry_cached_connection指令，可以关闭对后端长连接的无条件重试 [yaoweibin]
 * Feature: sysguard模块的sysguard_load指令中加入ncpu参数 [yzprofile]
@@ -218,6 +252,7 @@ Tengine-1.5.1 [2013-08-29]
 * Bugfix：修复在使用--without-dso选项时出现的编译错误 [zhuzhaoyuan]
 * Bugfix：修复两个编译警告 [zzjin, diwayou]
 
+
 Tengine-1.5.0 [2013-07-31]
 * Feature: 增加DSO（动态模块加载）兼容性校验机制 [monadbobo]
 * Feature: 增加了请求体不缓存到磁盘的机制，HTTP代理和FastCGI模块收到部分请求体即可以转发给后端服务器 [yaoweibin]
@@ -227,9 +262,11 @@ Tengine-1.5.0 [2013-07-31]
 * Bugfix：修复access_log指令中buffer参数失效的问题 [cfsego]
 * Bugfix：修复session_sticky模块在某些情况下没有发出session cookie的问题 [dinic]
 
+
 Tengine-1.4.6 [2013-05-14]
 * Bugfix：合并nginx-1.2.9的更新，修正CVE-2013-2070带来的安全问题。该安全问题在1.4.0以后开始出现 [yaoweibin]
 
+
 Tengine-1.4.5 [2013-05-01]
 * Feature：增加一致性hash模块，可以为后端服务器提供一致性hash的负载均衡方法 [dinic]
 * Feature：通过keepalive_timeout指令可以设置后端keepalive连接的超时时间 [jinglong]
@@ -238,6 +275,7 @@ Tengine-1.4.5 [2013-05-01]
 * Change：合并Nginx-1.2.8的更新 [yaoweibin]
 * Bugfix：修正syslog和upstream_check模块在GCC-4.4.5上的编译警告 [magicbear]
 
+
 Tengine-1.4.4 [2013-03-21]
 * Feature：增加session_sticky模块，可以为客户端和后端服务器提供会话保持功能 [dinic]
 * Feature：sysguard模块增加空闲内存监控功能 [lifeibo]
@@ -249,6 +287,7 @@ Tengine-1.4.4 [2013-03-21]
 * Bugfix：修正TFS模块返回值可能错误的问题 [zhcn381]
 * Bugfix: 修正TFS模块上传大文件可能出错的问题 [zhcn381]
 
+
 Tengine-1.4.3 [2013-1-21]
 * Feature：增加TFS模块，可以通过RESTful接口与TFS分布式文件系统通信 [zhcn381, monadbobo]
 * Feature：增加$sent_cookie_XXX系列变量，可以获取响应中Set-Cookie头的cookie值 [skoo87]
@@ -259,6 +298,7 @@ Tengine-1.4.3 [2013-1-21]
 * Bugfix：修复user_agent模块在请求缺少User-Agent头会段错误的问题 [dinic]
 * Bugfix：修复sysguard模块在Mac OS下面不能工作的问题 [lizi]
 
+
 Tengine-1.4.2 [2012-11-22]
 * Feature：增加--dso-tool-path配置选项，可以选择dso_tool脚本的安装目录 [monadbobo]
 * Feature：增加$unix_time变量，表示当前的时间戳秒数 [yaoweibin]
@@ -271,6 +311,7 @@ Tengine-1.4.2 [2012-11-22]
 * Bugfix：修复user-agent模块安装时需要拷贝browsers配置文件的问题，感谢Jianbin Xiao的报告 [monadbobo]
 * Bugfix：修复DSO模块RPM打包安装目录出错的问题，感谢Jianbin Xiao和Ren Xiaolei的报告 [monadbobo]
 
+
 Tengine-1.4.1 [2012-10-10]
 * Feature： 添加jemalloc库的支持 [fanjizhao]
 * Feature： 加入$dollar变量, 它的值就是美元符号 [zhuzhaoyuan]
@@ -279,6 +320,7 @@ Tengine-1.4.1 [2012-10-10]
 * Bugfix:  修正在Mac OS操作系统下，Lua模块与LuaJIT动态编译时出现的错误 [monadbobo]
 * Bugfix:  修正动态编译第三方filter模块时出现的模块执行顺序错误 [monadbobo]
 
+
 Tengine-1.4.0 [2012-09-05]
 * Feature： 增加动态模块加载支持（DSO），要添加一个模块不再需要重新编译tengine了 [monadbobo]
 * Feature： 更新Lua模块到最新的稳定版本 [chaoslawful, agentzh, jinglong]
@@ -297,13 +339,15 @@ Tengine-1.4.0 [2012-09-05]
 * Bugfix： 修正若干日志输出类型错误的问题 [yaoweibin]
 * Bugfix： 修正perl模块和proc一起打开的一个编译错误 [yzprofile]
 
+
 Tengine-1.3.0 [2012-05-25]
 * Feature：加入Lua模块，可以在配置中使用Lua语言 [chaoslawful, agentzh]
 * Feature：加入procs模块，可以更方便的开启独立进程 [yzprofile]
 * Change：user_agent模块中参数nongreedy改名为greedy [dinic]
 * Bugfix：修复syslog指令中因为指针未初始化引起的段错误 [cfsego]
 * Bugfix：修复syslog指令打开--with-ipv6选项引起的编译错误 [cfsego]
 
+
 Tengine-1.2.5 [2012-05-09]
 * Feature：增加upstream_check模块，对后端服务器做主动健康检查，以自动的下线失效的服务器 [yaoweibin]
 * Feature：允许syslog输出日志时指定程序的标识（program identifier） [cfsego]
@@ -312,13 +356,15 @@ Tengine-1.2.5 [2012-05-09]
 * Bugfix：修复syslog的一个在后端服务器连接不上导致端错误的bug [cfsego]
 * Bugfix：修复access_log可能和buffer参数冲突的bug [cfsego]
 
+
 Tengine-1.2.4 [2012-03-30]
 * Feature：增加user_agent模块 [dinic]
 * Feature：增加log_escape指令 [agentzh, skoo87]
 * Change：合并nginx-1.0.12至nginx-1.0.14之间的修改 [zhuzhaoyuan]
 * Bugfix：修复limit_req模块的一个bug [liseen.wan]
 * Bugfix：修复subrequest的一个bug [lifeibo]
 
+
 Tengine-1.2.3 [2012-02-27]
 * Feature：增加request_time_cache指令，用来控制是否启用精确的响应时间 [yzprofile]
 * Feature：增加slice模块，获得一个文件的一个片段，可以添加头和尾 [zhuzhaoyuan]
@@ -327,6 +373,7 @@ Tengine-1.2.3 [2012-02-27]
 * Bugfix：修复upstream中的一个process_header的bug [lifeibo]
 * Bugfix：修复expires_by_types的一个bug [lifeibo]
 
+
 Tengine-1.2.2 [2012-01-11]
 * Feature：增加input body filter机制 [cfsego]
 * Feature：对mail部分支持ssl的dialog [cfsego]
@@ -338,9 +385,11 @@ Tengine-1.2.2 [2012-01-11]
 * Bugfix：修正内容为空footer模块输出不正确的问题 [dinic]
 * Bugfix：修正syslog时hostname最后一个字母丢失的问题 [cfsego]
 
+
 Tengine-1.2.1 [2011-12-06]
 * Bugfix：修正默认错误日志和访问日志不存在时启动报错的bug [yzprofile]
 
+
 Tengine-1.2.0 [2011-11-29]
 * Feature：错误日志和访问日志支持输出到syslog [cfsego]
 * Feature：错误日志和访问日志支持输出到管道的方式 [cfsego]
@@ -377,4 +426,3 @@ Tengine-1.2.0 [2011-11-29]
 * Bugfix：修正error_page不能发现重复的code的问题，不能正常继承上一级设置的问题 [zhuzhaoyuan]
 * Bugfix：修正Nginx在处理FastCGI时有重复HTTP头会core dump的bug [monadbobo]
 * Bugfix：修正Nginx对CPU亲缘性设置不正确的bug [cfsego]
-