You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by me...@apache.org on 2020/03/31 00:38:27 UTC
[incubator-apisix] branch master updated: feature: merge upstream
tengine (2.3.2 < version < 2.3.3) patches (#1371)
This is an automated email from the ASF dual-hosted git repository.
membphis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git
The following commit(s) were added to refs/heads/master by this push:
new d0900ca feature: merge upstream tengine (2.3.2 < version < 2.3.3) patches (#1371)
d0900ca is described below
commit d0900caf27f669bbd5888bb07a9b8903ec42c4cf
Author: wonglend <gk...@qq.com>
AuthorDate: Tue Mar 31 08:38:16 2020 +0800
feature: merge upstream tengine (2.3.2 < version < 2.3.3) patches (#1371)
* feature: merge upstream tengine (2.3.2 < version < 2.3.3) patch: `Delete unused variable`
* feature: merge upstream tengine (2.3.2 < version < 2.3.3) patch: `POST request with keepalive peer cause 400 response`
* feature: merge upstream tengine (2.3.2 < version < 2.3.3) patch: `Memory content leak in nginx "rewrite" implementation`
---
.travis/linux_tengine_runner.sh | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.travis/linux_tengine_runner.sh b/.travis/linux_tengine_runner.sh
index afda911..0863fc1 100755
--- a/.travis/linux_tengine_runner.sh
+++ b/.travis/linux_tengine_runner.sh
@@ -106,6 +106,9 @@ tengine_install() {
wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-upstream_pipelining.patch
wget -P patches https://raw.githubusercontent.com/openresty/openresty/master/patches/nginx-1.17.4-upstream_timeout_fields.patch
wget -P patches https://raw.githubusercontent.com/totemofwolf/openresty/master/patches/tengine-2.3.2-privileged_agent_process.patch
+ wget -P patches https://raw.githubusercontent.com/totemofwolf/tengine/feature/patches/tengine-2.3.2-delete_unused_variable.patch
+ wget -P patches https://raw.githubusercontent.com/totemofwolf/tengine/feature/patches/tengine-2.3.2-keepalive_post_request_status.patch
+ wget -P patches https://raw.githubusercontent.com/totemofwolf/tengine/feature/patches/tengine-2.3.2-tolerate_backslash_zero_in_uri.patch
cd bundle/tengine-2.3.2
patch -p1 < ../../patches/nginx-1.17.4-always_enable_cc_feature_tests.patch
@@ -133,6 +136,9 @@ tengine_install() {
patch -p1 < ../../patches/nginx-1.17.4-upstream_pipelining.patch
patch -p1 < ../../patches/nginx-1.17.4-upstream_timeout_fields.patch
patch -p1 < ../../patches/tengine-2.3.2-privileged_agent_process.patch
+ patch -p1 < ../../patches/tengine-2.3.2-delete_unused_variable.patch
+ patch -p1 < ../../patches/tengine-2.3.2-keepalive_post_request_status.patch
+ patch -p1 < ../../patches/tengine-2.3.2-tolerate_backslash_zero_in_uri.patch
cd -
# patching end