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/apisix.git
The following commit(s) were added to refs/heads/master by this push: new 0b00e82 bugfix: avoid setting Server header twice (#2065) 0b00e82 is described below commit 0b00e82773bd71f988d5306ee886d9d1b795708f Author: 罗泽轩 <spacewander...@gmail.com> AuthorDate: Sat Aug 15 17:19:35 2020 +0800 bugfix: avoid setting Server header twice (#2065) Fix #2064. --- .travis/apisix_cli_test.sh | 10 ++++++++++ bin/apisix | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.travis/apisix_cli_test.sh b/.travis/apisix_cli_test.sh index d27df6b..020a90a 100755 --- a/.travis/apisix_cli_test.sh +++ b/.travis/apisix_cli_test.sh @@ -25,6 +25,16 @@ set -ex git checkout conf/config.yaml +# check 'Server: APISIX' is not in nginx.conf. We already added it in Lua code. +make init + +if grep "Server: APISIX" conf/nginx.conf > /dev/null; then + echo "failed: 'Server: APISIX' should not be added twice" + exit 1 +fi + +echo "passed: 'Server: APISIX' not in nginx.conf" + # check whether the 'reuseport' is in nginx.conf . make init diff --git a/bin/apisix b/bin/apisix index bc1e4e1..625f584 100755 --- a/bin/apisix +++ b/bin/apisix @@ -238,7 +238,6 @@ http { send_timeout {* http.send_timeout *}; server_tokens off; - more_set_headers 'Server: APISIX web server'; include mime.types; charset utf-8;