[GitHub] [incubator-apisix-dashboard] juzhiyuan closed issue #322: Object(xxx) Error

[GitBox]

juzhiyuan closed issue #322:
URL: https://github.com/apache/incubator-apisix-dashboard/issues/322


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix-dashboard] juzhiyuan closed issue #250: Hash mode

[GitBox]

juzhiyuan closed issue #250:
URL: https://github.com/apache/incubator-apisix-dashboard/issues/250


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix-website] nic-chen opened a new pull request #55: doc: update release note for TLP

[GitBox]

nic-chen opened a new pull request #55:
URL: https://github.com/apache/incubator-apisix-website/pull/55


   #54 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis commented on issue #1942: request help: benchmark with Envoy and other gateways

[GitBox]

membphis commented on issue #1942:
URL: 
https://github.com/apache/incubator-apisix/issues/1942#issuecomment-666970079


   ### fake-apisix
   
   https://github.com/apache/incubator-apisix/tree/master/benchmark/fake-apisix
   
   ```shell
   rain@benchmark:~/incubator-apisix-1.4.1/benchmark/fake-apisix/lua$ wrk 
http://127.0.0.1:9080/hello
   Running 10s test @ http://127.0.0.1:9080/hello
 2 threads and 10 connections
 Thread Stats   Avg  Stdev Max   +/- Stdev
   Latency   632.58us  165.85us  10.47ms   93.27%
   Req/Sec 7.89k   550.4014.46k95.52%
 157713 requests in 10.10s, 627.64MB read
   Requests/sec:  15616.42
   Transfer/sec: 62.15MB
   rain@benchmark:~/incubator-apisix-1.4.1/benchmark/fake-apisix/lua$ wrk 
http://127.0.0.1:9080/hello
   Running 10s test @ http://127.0.0.1:9080/hello
 2 threads and 10 connections
 Thread Stats   Avg  Stdev Max   +/- Stdev
   Latency   654.39us  176.10us   8.73ms   93.95%
   Req/Sec 7.63k   325.71 8.56k72.00%
 151762 requests in 10.00s, 603.96MB read
   Requests/sec:  15171.99
   Transfer/sec: 60.38MB
   rain@benchmark:~/incubator-apisix-1.4.1/benchmark/fake-apisix/lua$ wrk 
http://127.0.0.1:9080/hello
   Running 10s test @ http://127.0.0.1:9080/hello
 2 threads and 10 connections
 Thread Stats   Avg  Stdev Max   +/- Stdev
   Latency   647.82us  183.98us   8.57ms   94.02%
   Req/Sec 7.70k   646.8715.67k95.02%
 154012 requests in 10.10s, 612.92MB read
   Requests/sec:  15249.68
   Transfer/sec: 60.69MB
   ```



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis commented on a change in pull request #1953: add core.request.get_scheme/host/port/http_version

[GitBox]

membphis commented on a change in pull request #1953:
URL: https://github.com/apache/incubator-apisix/pull/1953#discussion_r463446572



##
File path: apisix/core/request.lua
##
@@ -94,7 +94,34 @@ function _M.get_remote_client_port(ctx)
 ctx = ngx.ctx.api_ctx
 end
 return tonumber(ctx.var.remote_port)
-  end
+end
+
+function _M.get_scheme(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.scheme or ''
+end
+
+function _M.get_host(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.host or ''
+end
+
+function _M.get_port(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return tonumber(ctx.var.server_port)
+end
+
+function _M.get_http_version()

Review comment:
   How about `_M.get_http_version = ngx.req.http_version` ?





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix-dashboard] moonming commented on a change in pull request #352: feat: prepare to release

[GitBox]

moonming commented on a change in pull request #352:
URL: 
https://github.com/apache/incubator-apisix-dashboard/pull/352#discussion_r463446840



##
File path: src/components/HeaderDropdown/index.less
##
@@ -1,3 +1,26 @@
+/*
+* MIT License
+
+* Copyright (c) 2019 Alipay.inc

Review comment:
   we should add Alipay to the LICENSE file, like 
https://github.com/apache/skywalking/blob/master/LICENSE#L204





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[incubator-apisix-dashboard] branch feat-release-asf updated (20adbcf -> 3728d89)

[juzhiyuan]

This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch feat-release-asf
in repository 
https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git.


from 20adbcf  feat: revert version
 add 3728d89  feat: update LICENSE

No new revisions were added by this update.

Summary of changes:
 LICENSE | 16 
 1 file changed, 16 insertions(+)

[incubator-apisix-dashboard] branch feat-release-asf updated (3728d89 -> 9eec3b3)

[juzhiyuan]

This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch feat-release-asf
in repository 
https://gitbox.apache.org/repos/asf/incubator-apisix-dashboard.git.


from 3728d89  feat: update LICENSE
 add 9eec3b3  feat: update License

No new revisions were added by this update.

Summary of changes:
 LICENSE |  3 ++-
 licenses/LICENSE-ant-design-pro.txt | 21 +
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 licenses/LICENSE-ant-design-pro.txt

[GitHub] [incubator-apisix-dashboard] juzhiyuan merged pull request #352: feat: prepare to release

[GitBox]

juzhiyuan merged pull request #352:
URL: https://github.com/apache/incubator-apisix-dashboard/pull/352


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix-dashboard] juzhiyuan closed issue #136: Complete the License information for the next dashboard

[GitBox]

juzhiyuan closed issue #136:
URL: https://github.com/apache/incubator-apisix-dashboard/issues/136


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis opened a new issue #1956: bug: should not modify the user `conf` in plugin

[GitBox]

membphis opened a new issue #1956:
URL: https://github.com/apache/incubator-apisix/issues/1956


   
   - [ ] openid-connect
   - [ ] zipkin
   - [ ] uri-blocker
   
   
   for example: 
https://github.com/apache/incubator-apisix/blob/master/apisix/plugins/zipkin.lua#L87
   
   we need another way.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis opened a new issue #1957: bug: return fail if failed to load SSL certificate by SNI

[GitBox]

membphis opened a new issue #1957:
URL: https://github.com/apache/incubator-apisix/issues/1957


   https://github.com/apache/incubator-apisix/blob/master/apisix/init.lua#L162
   
   only `warn` message is not enough.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis commented on issue #1957: bug: return fail if failed to load SSL certificate by SNI

[GitBox]

membphis commented on issue #1957:
URL: 
https://github.com/apache/incubator-apisix/issues/1957#issuecomment-666992337


   @nic-chen do you have time to handle this bug?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis opened a new pull request #1958: bugfix: use local variable.

[GitBox]

membphis opened a new pull request #1958:
URL: https://github.com/apache/incubator-apisix/pull/1958


   ### What this PR does / why we need it:
   
   
   
   fix https://github.com/apache/incubator-apisix/issues/1934
   
   ### Pre-submission checklist:
   
   * [ ] Did you explain what problem does this PR solve? Or what new features 
have been added?
   * [ ] Have you added corresponding test cases?
   * [ ] Have you modified the corresponding document?
   * [ ] Is this PR backward compatible?
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix-website] nic-chen merged pull request #55: doc: update release note for TLP

[GitBox]

nic-chen merged pull request #55:
URL: https://github.com/apache/incubator-apisix-website/pull/55


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[incubator-apisix-website] branch master updated: doc: update release note for TLP (#55)

[chenjunxu]

This is an automated email from the ASF dual-hosted git repository.

chenjunxu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git


The following commit(s) were added to refs/heads/master by this push:
 new 6bb98fb  doc: update release note for TLP (#55)
6bb98fb is described below

commit 6bb98fbec4d2c4349d0651d1eaf00b3bcde90ef4
Author: nic-chen <33000667+nic-c...@users.noreply.github.com>
AuthorDate: Fri Jul 31 16:34:39 2020 +0800

doc: update release note for TLP (#55)
---
 content/contribute/release/index.en.md | 51 +-
 content/contribute/release/index.zh.md | 48 +++-
 2 files changed, 47 insertions(+), 52 deletions(-)

diff --git a/content/contribute/release/index.en.md 
b/content/contribute/release/index.en.md
index 0e69bef..ae242ee 100644
--- a/content/contribute/release/index.en.md
+++ b/content/contribute/release/index.en.md
@@ -67,7 +67,7 @@ include_footer: true
 Add your GPG key to Apache svn
 download APISIX svn
 {{< highlight go "linenos=table" >}}
-$ svn --username=${Apache username} co 
https://dist.apache.org/repos/dist/dev/incubator/apisix
+$ svn --username=${Apache username} co 
https://dist.apache.org/repos/dist/dev/apisix
 {{< / highlight >}}
 {{< highlight go "linenos=table" >}}
 $ cd apisix
@@ -96,33 +96,33 @@ include_footer: true
 $ mkdir 1.0-rc1 && cd 1.0-rc1
 
 # download repo
-git clone -b v1.0 g...@github.com:apache/incubator-apisix.git 
apache-apisix-1.0-incubating
+git clone -b v1.0 g...@github.com:apache/incubator-apisix.git 
apache-apisix-1.0
 
 # check version
-$ cd apache-apisix-1.0-incubating && ./utils/check-version.sh 1.0 && cd ..
+$ cd apache-apisix-1.0 && ./utils/check-version.sh 1.0 && cd ..
 
 # delete .git
-$ rm -rf apache-apisix-1.0-incubating/.git
+$ rm -rf apache-apisix-1.0/.git
 
 # make tar package
-$ tar zcvf apache-apisix-1.0-rc1-incubating-src.tar.gz 
apache-apisix-1.0-incubating
+$ tar zcvf apache-apisix-1.0-rc1-src.tar.gz apache-apisix-1.0
 
 # Signature (this brings up a dialog box that prompts you to enter the 
password you entered when generating the gpg)
-$ gpg --armor --detach-sign apache-apisix-1.0-rc1-incubating-src.tar.gz
+$ gpg --armor --detach-sign apache-apisix-1.0-rc1-src.tar.gz
 
 # Generate sha512 checksum file
-$ shasum -a512 apache-apisix-1.0-rc1-incubating-src.tar.gz > 
apache-apisix-1.0-rc1-incubating-src.tar.gz.sha512
+$ shasum -a512 apache-apisix-1.0-rc1-src.tar.gz > 
apache-apisix-1.0-rc1-src.tar.gz.sha512
 
-# remove apache-apisix-1.0-rc1-incubating
-$ rm -rf apache-apisix-1.0-incubating
+# remove apache-apisix-1.0-rc1
+$ rm -rf apache-apisix-1.0
 
 # check files
 $ cd .. && tree
 .
 ├── 1.0-rc1
-│   ├── apache-apisix-1.0-rc1-incubating-src.tar.gz
-│   ├── apache-apisix-1.0-rc1-incubating-src.tar.gz.asc
-│   └── apache-apisix-1.0-rc1-incubating-src.tar.gz.sha512
+│   ├── apache-apisix-1.0-rc1-src.tar.gz
+│   ├── apache-apisix-1.0-rc1-src.tar.gz.asc
+│   └── apache-apisix-1.0-rc1-src.tar.gz.sha512
 └── KEYS
 
 1 directory, 4 files
@@ -130,9 +130,9 @@ include_footer: true
 # add files to SVN
 $ svn add *
 A 1.0-rc1
-A  (bin)  1.0-rc1/apache-apisix-1.0-rc1-incubating-src.tar.gz.asc
-A  (bin)  1.0-rc1/apache-apisix-1.0-rc1-incubating-src.tar.gz
-A 1.0-rc1/apache-apisix-1.0-rc1-incubating-src.tar.gz.sha512
+A  (bin)  1.0-rc1/apache-apisix-1.0-rc1-src.tar.gz.asc
+A  (bin)  1.0-rc1/apache-apisix-1.0-rc1-src.tar.gz
+A 1.0-rc1/apache-apisix-1.0-rc1-src.tar.gz.sha512
 svn: warning: W150002: '/home/resty/git/apache_svn/apisix/KEYS' is already 
under version control
 svn: E29: Could not add all targets because some targets are already 
versioned
 svn: E29: Illegal target for the requested operation
@@ -140,24 +140,23 @@ include_footer: true
 # commit to Apache SVN
 $ svn --username=${Apache username} commit -m "release 1.0-rc1"
 Adding 1.0-rc1
-Adding  (bin)  1.0-rc1/apache-apisix-1.0-rc1-incubating-src.tar.gz
-Adding  (bin)  1.0-rc1/apache-apisix-1.0-rc1-incubating-src.tar.gz.asc
-Adding 1.0-rc1/apache-apisix-1.0-rc1-incubating-src.tar.gz.sha512
+Adding  (bin)  1.0-rc1/apache-apisix-1.0-rc1-src.tar.gz
+Adding  (bin)  1.0-rc1/apache-apisix-1.0-rc1-src.tar.gz.asc
+Adding 1.0-rc1/apache-apisix-1.0-rc1-src.tar.gz.sha512
 Transmitting file data ...
 Committed revision 37435.
 {{< / highlight >}}
 Send vote thread to dev mailinglist
-https://lists.apache.org/thread.html/4d45dcbeecd0bb70f8010db3d075a5624817a5783beee66f392ae5e0%40%3Cdev.apisix.apache.org%3E";>Click
 here to view the reference emailThere is a minimum wait of 72 hours before 
statistical voting results. If you get -1 vote, you need to so

[incubator-apisix-website] branch asf-site updated: Deploy to GitHub pages

[github-bot]

This is an automated email from the ASF dual-hosted git repository.

github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-website.git


The following commit(s) were added to refs/heads/asf-site by this push:
 new 83b090d  Deploy to GitHub pages
83b090d is described below

commit 83b090d165d5ebfeb1cb34d3cfb6f48a201ef189
Author: github-actions[bot] 
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jul 31 08:35:04 2020 +

Deploy to GitHub pages
---
 contribute/release/index.html| 51 
 zh/contribute/release/index.html | 48 +
 2 files changed, 47 insertions(+), 52 deletions(-)

diff --git a/contribute/release/index.html b/contribute/release/index.html
index 406080f..0d57585 100644
--- a/contribute/release/index.html
+++ b/contribute/release/index.html
@@ -430,7 +430,7 @@ GnuPG-2.x：
 2
 
 
-$ svn --username=${Apache username} $ svn --username=${Apache username} 
 
 
@@ -546,33 +546,33 @@ GnuPG-2.x：
 $ mkdir 1.0-rc1 && cd 
1.0-rc1
 
 # download repo
-git clone -b v1.0 git@github.com:apache/git clone -b v1.0 git@github.com:apache/# check version
-$ cd apache-apisix-1.0-incubating 
&& ./uti [...]
+$ cd apache-apisix-1.0 && ./utils/check# delete .git
-$ rm -rf apache-apisix-1.0-incubating/.$ rm -rf apache-apisix-1.0/.git
 
 # make tar package
-$ tar zcvf apache-apisix-1.0-rc1-incubating [...]
+$ tar zcvf apache-apisix-1.0-rc1-src.# Signature (this 
brings up 
a dialog 
box that 
prompts you $ gpg --armor --detach-sign apache-apisix-< [...]
+$ gpg --armor --detach-sign apache-apisix-< [...]
 
 # Generate sha512 
checksum file
-$ shasum -a512 apache-apisix-1.0-rc1-$ shasum -a512 apache-apisix-1.0-rc1-# remove apache-apisix-1.0-rc1-incubating
-$ rm -rf apache-apisix-1.0-incubating
+# remove apache-apisix-1.0-rc1
+$ rm -rf apache-apisix-1.0
 
 # check files
 $ cd .. && tree
 .
 ├── 1.0-rc1
-│   ├── apache-apisix-1.0-rc1-incubating│   ├── apache-apisix-1.0-rc1-incubating│   └── apache-apisix-1.0-rc1-incubating│   ├── apache-apisix-1.0-rc1-src.│   ├── apache-apisix-1.0-rc1-src.│   └── apache-apisix-1.0-rc1-src.└── KEYS
 
 1 directory, 4 
files
@@ -580,9 +580,9 @@ GnuPG-2.x：
 # add files to SVN
 $ svn add *
 A 1.0-rc1
-A  (bin)  1.0-rc1/apache-apisix-1.0-rc1< [...]
-A  (bin)  1.0-rc1/apache-apisix-1.0-rc1< [...]
-A 1.0-rc1/apache-apisix-1.0-rc1- [...]
+A  (bin)  1.0-rc1/apache-apisix-1.0-rc1< [...]
+A  (bin)  1.0-rc1/apache-apisix-1.0-rc1< [...]
+A 1.0-rc1/apache-apisix-1.0-rc1- [...]
 svn: warning: W150002: '/home/resty/git/apache [...]
 svn: E29: Could 
not add 
all targets because 
some targets are 
alreadysvn: E29: Illegal target 
for the 
requested operation
@@ -590,26 +590,25 @@ GnuPG-2.x：
 # commit to Apache SVN
 $ svn --username=${Apache username} commit -m "release 1 [...]
 Adding 1.0-rc1
-Adding  (bin)  1.0-rc1/apache-apisix-1.0-Adding  (bin)  1.0-rc1/apache-apisix-1.0-Adding 1.0-rc1/apache-apisix-1.0-rc1Adding  (bin)  1.0-rc1/apache-apisix-1.0-Adding  (bin)  1.0-rc1/apache-apisix-1.0-Adding 1.0-rc1/apache-apisix-1.0-rc1Transmitting file data ...
 Committed revision 37435.
 
 
 
 Send vote thread to dev mailinglist
-https://lists.apache.org/thread.html/4d45dcbeecd0bb70f8010db3d075a5624817a5783beee66f392ae5e0%40%3Cdev.apisix.apache.org%3E";>Click
 here to view the reference emailThere is a minimum wait of 72 hours before 
statistical voting results. If you get -1 vote, you need to solve the problem 
before you can continue. 
+https://lists.apache.org/thread.html/r19d355210af8e9459e3e7a72578c511a13b226e5214ade3edf41c965%40%3Cdev.apisix.apache.org%3E";>Click
 here to view the reference emailThere is a minimum wait of 72 hours before 
statistical voting results. If you get -1 vote, you need to solve the problem 
before you can continue. 
+
 Send vote result thread to dev mailinglist
-https://lists.apache.org/thread.html/r8c6e14ea1a0c79b5dfb1dba0e1b6bc919a4797a0c4664f8add3b045c%40%3Cdev.apisix.apache.org%3E";>Click
 here to view the reference email at least 3 `+1` votes is required, then 
send the vote result to d...@apisix.apache.org. 
-Send vote thread to the incubator mailing list
-http://mail-archives.apache.org/mod_mbox/incubator-general/202004.mbox/%3cCABZgMXH7e-CfxXBr5fuPsEAsfMXU4jGs4L7EM2qz+zTcHP=u...@mail.gmail.com%3e";>Click
 here to view the reference email send vote thread to 
gene...@incubator.apache.org and add link of vote result of 
d...@apisix.apache.org in this new thread.
-Send vote result
-http://mail-archives.apache.org/mod_mbox/incubator-general/202004.mbox/%3ccabzgmxfal247-9u4ehabxrezhkjykzhh2izuiu2jdtx7zg4...@mail.gmail.com%3e";>Click
 here to view the reference email The

[GitHub] [incubator-apisix] membphis commented on issue #1923: feature: Divide config.yaml into two files config-custom.yaml & config-default.yaml

[GitBox]

membphis commented on issue #1923:
URL: 
https://github.com/apache/incubator-apisix/issues/1923#issuecomment-667011347


   > Is this an incompatible feature?
   
   it is a compatible feature. The user can still use his old 
`conf/config.yaml` as the user's own configuration.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] taotao2014 commented on a change in pull request #1953: add core.request.get_scheme/host/port/http_version

[GitBox]

taotao2014 commented on a change in pull request #1953:
URL: https://github.com/apache/incubator-apisix/pull/1953#discussion_r463488169



##
File path: apisix/core/request.lua
##
@@ -94,7 +94,34 @@ function _M.get_remote_client_port(ctx)
 ctx = ngx.ctx.api_ctx
 end
 return tonumber(ctx.var.remote_port)
-  end
+end
+
+function _M.get_scheme(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.scheme or ''
+end
+
+function _M.get_host(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.host or ''
+end
+
+function _M.get_port(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return tonumber(ctx.var.server_port)
+end
+
+function _M.get_http_version()

Review comment:
   Method is better





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis commented on a change in pull request #1953: add core.request.get_scheme/host/port/http_version

[GitBox]

membphis commented on a change in pull request #1953:
URL: https://github.com/apache/incubator-apisix/pull/1953#discussion_r463489057



##
File path: apisix/core/request.lua
##
@@ -94,7 +94,34 @@ function _M.get_remote_client_port(ctx)
 ctx = ngx.ctx.api_ctx
 end
 return tonumber(ctx.var.remote_port)
-  end
+end
+
+function _M.get_scheme(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.scheme or ''
+end
+
+function _M.get_host(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.host or ''
+end
+
+function _M.get_port(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return tonumber(ctx.var.server_port)
+end
+
+function _M.get_http_version()

Review comment:
   I think `_M.get_http_version = ngx.req.http_version` is better, simpler 
and faster.





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] taotao2014 commented on pull request #1953: add core.request.get_scheme/host/port/http_version

[GitBox]

taotao2014 commented on pull request #1953:
URL: https://github.com/apache/incubator-apisix/pull/1953#issuecomment-667014825


   > @taotao2014 please fix conflicting files: apisix/core/request.lua
   
   Only those with write access to this repository can merge pull requests.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] taotao2014 commented on pull request #1953: add core.request.get_scheme/host/port/http_version

[GitBox]

taotao2014 commented on pull request #1953:
URL: https://github.com/apache/incubator-apisix/pull/1953#issuecomment-667015127


   > @taotao2014 please fix conflicting files: apisix/core/request.lua
   
   Only those with write access to this repository can merge pull requests.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] taotao2014 removed a comment on pull request #1953: add core.request.get_scheme/host/port/http_version

[GitBox]

taotao2014 removed a comment on pull request #1953:
URL: https://github.com/apache/incubator-apisix/pull/1953#issuecomment-667014825


   > @taotao2014 please fix conflicting files: apisix/core/request.lua
   
   Only those with write access to this repository can merge pull requests.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] taotao2014 commented on a change in pull request #1953: add core.request.get_scheme/host/port/http_version

[GitBox]

taotao2014 commented on a change in pull request #1953:
URL: https://github.com/apache/incubator-apisix/pull/1953#discussion_r463493811



##
File path: apisix/core/request.lua
##
@@ -94,7 +94,34 @@ function _M.get_remote_client_port(ctx)
 ctx = ngx.ctx.api_ctx
 end
 return tonumber(ctx.var.remote_port)
-  end
+end
+
+function _M.get_scheme(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.scheme or ''
+end
+
+function _M.get_host(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.host or ''
+end
+
+function _M.get_port(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return tonumber(ctx.var.server_port)
+end
+
+function _M.get_http_version()

Review comment:
   Keep the style consistent,user acceptance is easier.





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] jackwoods opened a new pull request #1959: feature: accept ":" in id (#1955)

[GitBox]

jackwoods opened a new pull request #1959:
URL: https://github.com/apache/incubator-apisix/pull/1959


   ### What this PR does / why we need it:
   Sometimes we might hope the id in the following format: 
   - upstream:payment:project_a
   - upstream:message_system:project_b
   etc.
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] jackwoods commented on issue #1954: bug: service id does not support string

[GitBox]

jackwoods commented on issue #1954:
URL: 
https://github.com/apache/incubator-apisix/issues/1954#issuecomment-667025558


   I saw @membphis has fixed it in branch v1.4.1



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] jackwoods closed issue #1954: bug: service id does not support string

[GitBox]

jackwoods closed issue #1954:
URL: https://github.com/apache/incubator-apisix/issues/1954


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] jackwoods commented on issue #1955: feature: accept ":" in id?

[GitBox]

jackwoods commented on issue #1955:
URL: 
https://github.com/apache/incubator-apisix/issues/1955#issuecomment-667026243


   https://github.com/apache/incubator-apisix/pull/1959



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] moonming commented on pull request #1959: feature: accept ":" in id (#1955)

[GitBox]

moonming commented on pull request #1959:
URL: https://github.com/apache/incubator-apisix/pull/1959#issuecomment-667045981


   @jackwoods please add test cases



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] ChelinTsien opened a new pull request #1960: add AK/SK auth plugin

[GitBox]

ChelinTsien opened a new pull request #1960:
URL: https://github.com/apache/incubator-apisix/pull/1960


   ### What this PR does / why we need it:
   
   
   
   add ak/sk  auth plugin 
   fix #1653. 
   
   ### Pre-submission checklist:
   
   * [x ] Did you explain what problem does this PR solve? Or what new features 
have been added?
   * [ ] Have you added corresponding test cases?
   * [ ] Have you modified the corresponding document?
   * [ x] Is this PR backward compatible?
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] ChelinTsien commented on pull request #1960: add AK/SK auth plugin

[GitBox]

ChelinTsien commented on pull request #1960:
URL: https://github.com/apache/incubator-apisix/pull/1960#issuecomment-667050908


   Document to be added later



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] ChelinTsien commented on pull request #1943: feature: support etcd v3

[GitBox]

ChelinTsien commented on pull request #1943:
URL: https://github.com/apache/incubator-apisix/pull/1943#issuecomment-667051469


   > the same feature as #1941?
   
   yes



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] ChelinTsien commented on pull request #1941: etcd v3 api support

[GitBox]

ChelinTsien commented on pull request #1941:
URL: https://github.com/apache/incubator-apisix/pull/1941#issuecomment-667053701


   Added before #1943,  why not review my pr?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] swayamraina commented on issue #1877: request help: add version in http response `server` header

[GitBox]

swayamraina commented on issue #1877:
URL: 
https://github.com/apache/incubator-apisix/issues/1877#issuecomment-667068368


   @membphis can you please help here?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis commented on issue #1877: request help: add version in http response `server` header

[GitBox]

membphis commented on issue #1877:
URL: 
https://github.com/apache/incubator-apisix/issues/1877#issuecomment-667072442


   you can submit your code first. then I will help you where is the problem. 
^_^ @swayamraina 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis commented on pull request #1941: etcd v3 api support

[GitBox]

membphis commented on pull request #1941:
URL: https://github.com/apache/incubator-apisix/pull/1941#issuecomment-667073783


   `add aws sign` why we need this commit?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis commented on a change in pull request #1953: add core.request.get_scheme/host/port/http_version

[GitBox]

membphis commented on a change in pull request #1953:
URL: https://github.com/apache/incubator-apisix/pull/1953#discussion_r463556815



##
File path: apisix/core/request.lua
##
@@ -94,7 +94,34 @@ function _M.get_remote_client_port(ctx)
 ctx = ngx.ctx.api_ctx
 end
 return tonumber(ctx.var.remote_port)
-  end
+end
+
+function _M.get_scheme(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.scheme or ''
+end
+
+function _M.get_host(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.host or ''
+end
+
+function _M.get_port(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return tonumber(ctx.var.server_port)
+end
+
+function _M.get_http_version()
+

Review comment:
   remove this blank line

##
File path: apisix/core/request.lua
##
@@ -94,7 +94,34 @@ function _M.get_remote_client_port(ctx)
 ctx = ngx.ctx.api_ctx
 end
 return tonumber(ctx.var.remote_port)
-  end
+end
+
+function _M.get_scheme(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.scheme or ''
+end
+
+function _M.get_host(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.host or ''
+end
+
+function _M.get_port(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return tonumber(ctx.var.server_port)
+end
+
+function _M.get_http_version()
+
+return ngx.req.http_version()
+

Review comment:
   ditto





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis commented on a change in pull request #1953: add core.request.get_scheme/host/port/http_version

[GitBox]

membphis commented on a change in pull request #1953:
URL: https://github.com/apache/incubator-apisix/pull/1953#discussion_r463557465



##
File path: apisix/core/request.lua
##
@@ -94,7 +94,34 @@ function _M.get_remote_client_port(ctx)
 ctx = ngx.ctx.api_ctx
 end
 return tonumber(ctx.var.remote_port)
-  end
+end
+
+function _M.get_scheme(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.scheme or ''
+end
+
+function _M.get_host(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.host or ''
+end
+
+function _M.get_port(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return tonumber(ctx.var.server_port)
+end
+
+function _M.get_http_version()

Review comment:
   > Keep the style consistent,user acceptance is easier.
   
   We always need APISIX core to have good performance, that is very important.





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis merged pull request #1918: bugfix: passive health check seems never provide a healthy report

[GitBox]

membphis merged pull request #1918:
URL: https://github.com/apache/incubator-apisix/pull/1918


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[incubator-apisix] branch master updated: bugfix: passive health check seems never provide a healthy report (#1918)

[membphis]

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 2ba0231  bugfix: passive health check seems never provide a healthy 
report (#1918)
2ba0231 is described below

commit 2ba023114085f85c1ada0a8c54279fad4514fda2
Author: YuanSheng Wang 
AuthorDate: Fri Jul 31 19:31:20 2020 +0800

bugfix: passive health check seems never provide a healthy report (#1918)

Fix #1640
---
 apisix/balancer.lua  |   1 +
 apisix/init.lua  |  57 +++-
 t/node/healthcheck-passive.t | 121 +++
 3 files changed, 178 insertions(+), 1 deletion(-)

diff --git a/apisix/balancer.lua b/apisix/balancer.lua
index 145856f..36f4f32 100644
--- a/apisix/balancer.lua
+++ b/apisix/balancer.lua
@@ -192,6 +192,7 @@ local function pick_server(route, ctx)
 local version = ctx.upstream_version
 local key = ctx.upstream_key
 local checker = fetch_healthchecker(up_conf, healthcheck_parent, version)
+ctx.up_checker = checker
 
 ctx.balancer_try_count = (ctx.balancer_try_count or 0) + 1
 if checker and ctx.balancer_try_count > 1 then
diff --git a/apisix/init.lua b/apisix/init.lua
index 354290d..99f75e2 100644
--- a/apisix/init.lua
+++ b/apisix/init.lua
@@ -567,9 +567,64 @@ function _M.http_body_filter_phase()
 end
 
 
-function _M.http_log_phase()
+local function healcheck_passive(api_ctx)
+local checker = api_ctx.up_checker
+if not checker then
+return
+end
+
+local up_conf = api_ctx.upstream_conf
+local passive = up_conf.checks.passive
+if not passive then
+return
+end
+
+core.log.info("enabled healthcheck passive")
+local host = up_conf.checks and up_conf.checks.active
+ and up_conf.checks.active.host
+local port = up_conf.checks and up_conf.checks.active
+ and up_conf.checks.active.port
+
+local resp_status = ngx.status
+local http_statuses = passive and passive.healthy and
+  passive.healthy.http_statuses
+core.log.info("passive.healthy.http_statuses: ",
+  core.json.delay_encode(http_statuses))
+if http_statuses then
+for i, status in ipairs(http_statuses) do
+if resp_status == status then
+checker:report_http_status(api_ctx.balancer_ip,
+   port or api_ctx.balancer_port,
+   host,
+   resp_status)
+end
+end
+end
 
+local http_statuses = passive and passive.unhealthy and
+  passive.unhealthy.http_statuses
+core.log.info("passive.unhealthy.http_statuses: ",
+  core.json.delay_encode(http_statuses))
+if not http_statuses then
+return
+end
+
+for i, status in ipairs(http_statuses) do
+for i, status in ipairs(http_statuses) do
+if resp_status == status then
+checker:report_http_status(api_ctx.balancer_ip,
+   port or api_ctx.balancer_port,
+   host,
+   resp_status)
+end
+end
+end
+end
+
+
+function _M.http_log_phase()
 local api_ctx = common_phase("log")
+healcheck_passive(api_ctx)
 
 if api_ctx.uri_parse_param then
 core.tablepool.release("uri_parse_param", api_ctx.uri_parse_param)
diff --git a/t/node/healthcheck-passive.t b/t/node/healthcheck-passive.t
new file mode 100644
index 000..edc6017
--- /dev/null
+++ b/t/node/healthcheck-passive.t
@@ -0,0 +1,121 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+use t::APISIX 'no_plan';
+
+master_on();
+repeat_each(1);
+log_level('info');
+no_root_location();
+no_shuffle();
+worker_connections(256);
+
+run_tests();
+
+__DATA__
+
+=== TEST 1: set route(only passive)
+--- config
+location /t {
+content_by_lua_block {
+local t = require("lib.test_adm

[GitHub] [incubator-apisix] membphis closed issue #1640: question: passive health check seems never provide a healthy report

[GitBox]

membphis closed issue #1640:
URL: https://github.com/apache/incubator-apisix/issues/1640


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] swayamraina opened a new pull request #1961: add apisix-version info to headers

[GitBox]

swayamraina opened a new pull request #1961:
URL: https://github.com/apache/incubator-apisix/pull/1961


   ### What this PR does / why we need it:
   We should pass the APISIX version in the response headers
   fixes : https://github.com/apache/incubator-apisix/issues/1877
   
   ### Pre-submission checklist:
   
   * [x] Did you explain what problem does this PR solve? Or what new features 
have been added?
   * [ ] Have you added corresponding test cases?
   * [ ] Have you modified the corresponding document?
   * [ ] Is this PR backward compatible?
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] ChelinTsien commented on issue #1653: add AK/SK auth plugin

[GitBox]

ChelinTsien commented on issue #1653:
URL: 
https://github.com/apache/incubator-apisix/issues/1653#issuecomment-667079327


   @membphis this is ak/sk auth ，implemented according to aws v4, just badly 
named.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis commented on pull request #1960: add AK/SK auth plugin

[GitBox]

membphis commented on pull request #1960:
URL: https://github.com/apache/incubator-apisix/pull/1960#issuecomment-667081520


   > Document to be added later
   
   yes, that is important



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix-website] membphis commented on issue #54: update release note for TLP

[GitBox]

membphis commented on issue #54:
URL: 
https://github.com/apache/incubator-apisix-website/issues/54#issuecomment-667082210


   can we close this issue now?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis commented on pull request #1961: add apisix-version info to headers

[GitBox]

membphis commented on pull request #1961:
URL: https://github.com/apache/incubator-apisix/pull/1961#issuecomment-667084145


   please take a look at this patch:
   
   ```diff
   diff --git a/apisix/init.lua b/apisix/init.lua
   index 354290dc..e465a372 100644
   --- a/apisix/init.lua
   +++ b/apisix/init.lua
   @@ -39,6 +39,7 @@ local load_balancer
local local_conf
local dns_resolver
local lru_resolved_domain
   +local apisix_ver= "APISIX/" .. core.version.VERSION
   
   
local function parse_args(args)
   @@ -299,6 +300,8 @@ function _M.http_access_phase()
   
core.ctx.set_vars_meta(api_ctx)
   
   +core.response.set_header("server", apisix_ver)
   +
-- load and run global rule
if router.global_rules and router.global_rules.values
   and #router.global_rules.values > 0 then
   ```



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis edited a comment on pull request #1961: add apisix-version info to headers

[GitBox]

membphis edited a comment on pull request #1961:
URL: https://github.com/apache/incubator-apisix/pull/1961#issuecomment-667084145


   please take a look at this patch, @justinmclean :
   
   ```diff
   diff --git a/apisix/init.lua b/apisix/init.lua
   index 354290dc..e465a372 100644
   --- a/apisix/init.lua
   +++ b/apisix/init.lua
   @@ -39,6 +39,7 @@ local load_balancer
local local_conf
local dns_resolver
local lru_resolved_domain
   +local apisix_ver= "APISIX/" .. core.version.VERSION
   
   
local function parse_args(args)
   @@ -299,6 +300,8 @@ function _M.http_access_phase()
   
core.ctx.set_vars_meta(api_ctx)
   
   +core.response.set_header("server", apisix_ver)
   +
-- load and run global rule
if router.global_rules and router.global_rules.values
   and #router.global_rules.values > 0 then
   ```



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis commented on pull request #1959: feature: accept ":" in id (#1955)

[GitBox]

membphis commented on pull request #1959:
URL: https://github.com/apache/incubator-apisix/pull/1959#issuecomment-667089765


   @jackwoods That is the right way, I have helped you updated.
   
   
![image](https://user-images.githubusercontent.com/6814606/89033857-55574c00-d36a-11ea-99d5-1b6b12af27af.png)
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis commented on issue #1952: request help: build-in etcd service discovery example

[GitBox]

membphis commented on issue #1952:
URL: 
https://github.com/apache/incubator-apisix/issues/1952#issuecomment-667090729


   Discovery service protocol: 
https://etcd.io/docs/v3.4.0/dev-internal/discovery_protocol/



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis merged pull request #1958: bugfix: avoid to modify the original plugin conf.

[GitBox]

membphis merged pull request #1958:
URL: https://github.com/apache/incubator-apisix/pull/1958


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[incubator-apisix] branch master updated: bugfix: avoid to modify the original plugin conf. (#1958)

[membphis]

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 8fc2af5  bugfix: avoid to modify the original plugin conf. (#1958)
8fc2af5 is described below

commit 8fc2af56aefe70c539f8ba181374ae80a657ab08
Author: YuanSheng Wang 
AuthorDate: Fri Jul 31 20:19:12 2020 +0800

bugfix: avoid to modify the original plugin conf. (#1958)

relate issue: #1934 , #1956
---
 apisix/plugins/openid-connect.lua |  3 ++-
 apisix/plugins/redirect.lua   | 19 ---
 apisix/plugins/uri-blocker.lua| 18 +-
 apisix/plugins/zipkin.lua |  4 ++--
 t/plugin/uri-blocker.t| 22 --
 5 files changed, 41 insertions(+), 25 deletions(-)

diff --git a/apisix/plugins/openid-connect.lua 
b/apisix/plugins/openid-connect.lua
index 2572c85..29aca4c 100644
--- a/apisix/plugins/openid-connect.lua
+++ b/apisix/plugins/openid-connect.lua
@@ -139,7 +139,8 @@ local function add_user_header(user)
 end
 
 
-function _M.access(conf, ctx)
+function _M.access(plugin_conf, ctx)
+local conf = core.table.clone(plugin_conf)
 if not conf.redirect_uri then
 conf.redirect_uri = ctx.var.request_uri
 end
diff --git a/apisix/plugins/redirect.lua b/apisix/plugins/redirect.lua
index a9df21f..de9c769 100644
--- a/apisix/plugins/redirect.lua
+++ b/apisix/plugins/redirect.lua
@@ -126,21 +126,26 @@ end
 function _M.rewrite(conf, ctx)
 core.log.info("plugin rewrite phase, conf: ", core.json.delay_encode(conf))
 
+local ret_code = conf.ret_code
+local uri = conf.uri
+
 if conf.http_to_https and ctx.var.scheme == "http" then
-conf.uri = "https://$host$request_uri";
-conf.ret_code = 301
+-- TODO： add test case
+-- PR: https://github.com/apache/incubator-apisix/pull/1958
+uri = "https://$host$request_uri";
+ret_code = 301
 end
 
-if conf.uri and conf.ret_code then
-local new_uri, err = concat_new_uri(conf.uri, ctx)
+if uri and ret_code then
+local new_uri, err = concat_new_uri(uri, ctx)
 if not new_uri then
-core.log.error("failed to generate new uri by: ", conf.uri, " 
error: ",
-err)
+core.log.error("failed to generate new uri by: ", uri, " error: ",
+   err)
 core.response.exit(500)
 end
 
 core.response.set_header("Location", new_uri)
-core.response.exit(conf.ret_code)
+core.response.exit(ret_code)
 end
 end
 
diff --git a/apisix/plugins/uri-blocker.lua b/apisix/plugins/uri-blocker.lua
index ab5b682..b3dba18 100644
--- a/apisix/plugins/uri-blocker.lua
+++ b/apisix/plugins/uri-blocker.lua
@@ -57,18 +57,15 @@ function _M.check_schema(conf)
 return false, err
 end
 
-local block_rules = {}
 for i, re_rule in ipairs(conf.block_rules) do
 local ok, err = re_compile(re_rule, "j")
--- core.log.warn("ok: ", tostring(ok), " err: ", tostring(err), " 
re_rule: ", re_rule)
+-- core.log.warn("ok: ", tostring(ok), " err: ", tostring(err),
+--   " re_rule: ", re_rule)
 if not ok then
 return false, err
 end
-block_rules[i] = re_rule
 end
 
-conf.block_rules_concat = core.table.concat(block_rules, "|")
-core.log.info("concat block_rules: ", conf.block_rules_concat)
 return true
 end
 
@@ -76,6 +73,17 @@ end
 function _M.rewrite(conf, ctx)
 core.log.info("uri: ", ctx.var.request_uri)
 core.log.info("block uri rules: ", conf.block_rules_concat)
+
+if not conf.block_rules_concat then
+local block_rules = {}
+for i, re_rule in ipairs(conf.block_rules) do
+block_rules[i] = re_rule
+end
+
+conf.block_rules_concat = core.table.concat(block_rules, "|")
+core.log.info("concat block_rules: ", conf.block_rules_concat)
+end
+
 local from = re_find(ctx.var.request_uri, conf.block_rules_concat, "jo")
 if from then
 core.response.exit(conf.rejected_code)
diff --git a/apisix/plugins/zipkin.lua b/apisix/plugins/zipkin.lua
index 934d883..eebf07e 100644
--- a/apisix/plugins/zipkin.lua
+++ b/apisix/plugins/zipkin.lua
@@ -81,8 +81,8 @@ local function report2endpoint(premature, reporter)
 end
 
 
-function _M.rewrite(conf, ctx)
-
+function _M.rewrite(plugin_conf, ctx)
+local conf = core.table.clone(plugin_conf)
 -- once the server started, server_addr and server_port won't change, so 
we can cache it.
 conf.server_port = tonumber(ctx.var['server_port'])
 
diff --git a/t/plugin/uri-blocker.t b/t/plugin/uri-blocker.t
index 3cf2e37..a470055 100644
--- a/t/plugin/uri-blocker.t
+++ b/t/plugin/uri-blocker.t
@@ -16,7 +16,7 @@
 #
 use t::APISIX 'no_plan';
 
-repeat_each(2);
+repeat_each(1);

[GitHub] [incubator-apisix] membphis closed issue #1956: bug: should not modify the user `conf` in plugin

[GitBox]

membphis closed issue #1956:
URL: https://github.com/apache/incubator-apisix/issues/1956


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis commented on issue #1934: bug: redirect plugin redirects all the time when https

[GitBox]

membphis commented on issue #1934:
URL: 
https://github.com/apache/incubator-apisix/issues/1934#issuecomment-667092308


   @ACanOfGas please make a try with the master branch, we have fixed this 
issue.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis closed issue #1934: bug: redirect plugin redirects all the time when https

[GitBox]

membphis closed issue #1934:
URL: https://github.com/apache/incubator-apisix/issues/1934


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis opened a new issue #1962: need test case: redirect plugin

[GitBox]

membphis opened a new issue #1962:
URL: https://github.com/apache/incubator-apisix/issues/1962


   
https://github.com/apache/incubator-apisix/pull/1958/files#diff-cdaf7c2893523e3e57d9b439cb5d2b23R133
   
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] ShiningRush opened a new pull request #1963: feat: add option for cors

[GitBox]

ShiningRush opened a new pull request #1963:
URL: https://github.com/apache/incubator-apisix/pull/1963


   fixed with #1915 #1704 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis merged pull request #1925: test: old test case is unstable, running fail sometimes.

[GitBox]

membphis merged pull request #1925:
URL: https://github.com/apache/incubator-apisix/pull/1925


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[incubator-apisix] branch master updated (8fc2af5 -> 3d8150b)

[membphis]

This is an automated email from the ASF dual-hosted git repository.

membphis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git.


from 8fc2af5  bugfix: avoid to modify the original plugin conf. (#1958)
 add 3d8150b  test: old test case is unstable, running fail sometimes. 
(#1925)

No new revisions were added by this update.

Summary of changes:
 t/node/invalid-upstream.t | 60 ++-
 1 file changed, 38 insertions(+), 22 deletions(-)

[incubator-apisix] branch master updated (8fc2af5 -> 3d8150b)

[membphis]

This is an automated email from the ASF dual-hosted git repository.

membphis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git.


from 8fc2af5  bugfix: avoid to modify the original plugin conf. (#1958)
 add 3d8150b  test: old test case is unstable, running fail sometimes. 
(#1925)

No new revisions were added by this update.

Summary of changes:
 t/node/invalid-upstream.t | 60 ++-
 1 file changed, 38 insertions(+), 22 deletions(-)

[incubator-apisix] branch master updated (8fc2af5 -> 3d8150b)

[membphis]

This is an automated email from the ASF dual-hosted git repository.

membphis pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix.git.


from 8fc2af5  bugfix: avoid to modify the original plugin conf. (#1958)
 add 3d8150b  test: old test case is unstable, running fail sometimes. 
(#1925)

No new revisions were added by this update.

Summary of changes:
 t/node/invalid-upstream.t | 60 ++-
 1 file changed, 38 insertions(+), 22 deletions(-)

[GitHub] [incubator-apisix-website] juzhiyuan closed issue #54: update release note for TLP

[GitBox]

juzhiyuan closed issue #54:
URL: https://github.com/apache/incubator-apisix-website/issues/54


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] taotao2014 commented on a change in pull request #1953: add core.request.get_scheme/host/port/http_version

[GitBox]

taotao2014 commented on a change in pull request #1953:
URL: https://github.com/apache/incubator-apisix/pull/1953#discussion_r463622806



##
File path: apisix/core/request.lua
##
@@ -94,7 +94,34 @@ function _M.get_remote_client_port(ctx)
 ctx = ngx.ctx.api_ctx
 end
 return tonumber(ctx.var.remote_port)
-  end
+end
+
+function _M.get_scheme(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.scheme or ''
+end
+
+function _M.get_host(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return ctx.var.host or ''
+end
+
+function _M.get_port(ctx)
+if not ctx then
+ctx = ngx.ctx.api_ctx
+end
+return tonumber(ctx.var.server_port)
+end
+
+function _M.get_http_version()
+
+return ngx.req.http_version()
+

Review comment:
   removed





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] Yiyiyimu commented on pull request #1943: feature: support etcd v3

[GitBox]

Yiyiyimu commented on pull request #1943:
URL: https://github.com/apache/incubator-apisix/pull/1943#issuecomment-667155565


   Hi @ChelinTsien @moonming supporting etcd v3 is a task of [ISCAS summer 
plan](https://cwiki.apache.org/confluence/display/APISIX/Open+Source+Promotion+Plan+-+Summer+2020+Tasks)
 (#1542)



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix-dashboard] bzp2010 commented on pull request #330: feat(authentication): create authentication module

[GitBox]

bzp2010 commented on pull request #330:
URL: 
https://github.com/apache/incubator-apisix-dashboard/pull/330#issuecomment-667181852


   > The frontend of authentication module has been basically completed. The 
modification to the Manager API in this pull request has been temporarily 
removed. A new pull request will be created to modify it, and change the 
connect function in frontend. 
   This pull request can be review first.
   
   Finished
   - [x] User authentication framework
   - [x] User LoginMethod interface definion
   - [x] Create router item
   
   Unfinished
   - [ ] Connect to Manager API



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix-dashboard] bzp2010 edited a comment on pull request #330: feat(authentication): create authentication module

[GitBox]

bzp2010 edited a comment on pull request #330:
URL: 
https://github.com/apache/incubator-apisix-dashboard/pull/330#issuecomment-667181852


   > The frontend of authentication module has been basically completed. The 
modification to the Manager API in this pull request has been temporarily 
removed, because code confusion. A new pull request will be created to modify 
it, and change the connect function in frontend. 
   This pull request can be review first.
   
   Finished
   - [x] User authentication framework
   - [x] User LoginMethod interface definion
   - [x] Create router item
   
   Unfinished
   - [ ] Connect to Manager API



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis commented on a change in pull request #1963: feat: add option for cors

[GitBox]

membphis commented on a change in pull request #1963:
URL: https://github.com/apache/incubator-apisix/pull/1963#discussion_r463681866



##
File path: apisix/plugins/cors.lua
##
@@ -146,10 +146,16 @@ function _M.rewrite(conf, ctx)
 
 ctx.cors_allow_origins = allow_origins
 set_cors_headers(conf, ctx)
+end
 
+function _M.rewrite(conf, ctx)
 if ctx.var.request_method == "OPTIONS" then
 return 200
 end
 end
 
+function _M.header_filter(conf, ctx)

Review comment:
   two blank lines between different functions.

##
File path: apisix/plugins/cors.lua
##
@@ -114,17 +114,17 @@ local function set_cors_headers(conf, ctx)
 allow_methods = "GET,POST,PUT,DELETE,PATCH,HEAD,OPTIONS,CONNECT,TRACE"
 end
 
-ngx.header["Access-Control-Allow-Origin"] = ctx.cors_allow_origins
-ngx.header["Access-Control-Allow-Methods"] = allow_methods
-ngx.header["Access-Control-Allow-Headers"] = conf.allow_headers
-ngx.header["Access-Control-Max-Age"] = conf.max_age
+core.response.set_header("Access-Control-Allow-Origin", 
ctx.cors_allow_origins)
+core.response.set_header("Access-Control-Allow-Methods", allow_methods)
+core.response.set_header("Access-Control-Allow-Headers", 
conf.allow_headers)
+core.response.set_header("Access-Control-Max-Age", conf.max_age)
+core.response.set_header("Access-Control-Expose-Headers", 
conf.expose_headers)
 if conf.allow_credential then
-ngx.header["Access-Control-Allow-Credentials"] = true
+core.response.set_header("Access-Control-Allow-Credentials", true)
 end
-ngx.header["Access-Control-Expose-Headers"] = conf.expose_headers
 end
 
-function _M.rewrite(conf, ctx)
+local function set_cors(conf, ctx)

Review comment:
   
https://github.com/apache/incubator-apisix/blob/8d2e758e1e60413f57338c7c54e5e5c405f229a5/apisix/plugins/cors.lua#L128-L148
   
   we can copy them into `header_filter` and remove function `set_cors`





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] membphis commented on a change in pull request #1963: feat: add option for cors

[GitBox]

membphis commented on a change in pull request #1963:
URL: https://github.com/apache/incubator-apisix/pull/1963#discussion_r463683726



##
File path: t/plugin/cors.t
##
@@ -491,3 +491,134 @@ Access-Control-Max-Age: 5
 Access-Control-Allow-Credentials:
 --- no_error_log
 [error]
+
+
+Access-Control-Expose-Headers: e-headers
+--- no_error_log
+[error]
+
+
+
+=== TEST 17: set route(overwrite upstream)
+--- config
+location /t {
+content_by_lua_block {
+local t = require("lib.test_admin").test
+local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+"plugins": {
+"cors": {
+"allow_origins": "**",
+"allow_methods": "**",
+"allow_headers": "*",
+"expose_headers": "*",
+"allow_credential": true
+}
+},
+"upstream": {
+"nodes": {
+"127.0.0.1:1980": 1
+},
+"type": "roundrobin"
+},
+"uri": "/headers"
+}]]
+)
+
+if code >= 300 then
+ngx.status = code
+end
+ngx.say(body)
+}
+}
+--- request
+GET /t
+--- response_body
+passed
+--- no_error_log
+[error]
+
+
+
+=== TEST 18: overwrite upstream
+--- request
+GET /headers?Access-Control-Allow-Origin=https://sub.domain.com HTTP/1.1
+--- more_headers
+Origin: https://sub.domain.com
+--- response_body
+/headers
+--- response_headers
+Access-Control-Allow-Origin: https://sub.domain.com
+--- no_error_log
+[error]
+
+
+
+=== TEST 19: overwrite upstream(Access-Control-Allow-Methods)
+--- request
+GET /headers?Access-Control-Allow-Methods=methods HTTP/1.1
+--- more_headers
+Origin: https://sub.domain.com
+--- response_body
+/headers
+--- response_headers
+Access-Control-Allow-Methods: 
GET,POST,PUT,DELETE,PATCH,HEAD,OPTIONS,CONNECT,TRACE
+--- no_error_log
+[error]
+
+
+
+=== TEST 20: overwrite upstream(Access-Control-Allow-Headers)
+--- request
+GET /headers?Access-Control-Allow-Headers=a-headers HTTP/1.1
+--- more_headers
+Origin: https://sub.domain.com
+--- response_body
+/headers
+--- response_headers
+Access-Control-Allow-Headers: *
+--- no_error_log
+[error]
+
+
+
+=== TEST 21: overwrite upstream(Access-Control-Expose-Headers)
+--- request
+GET /headers?Access-Control-Expose-Headers=e-headers HTTP/1.1
+--- more_headers
+Origin: https://sub.domain.com
+--- response_body
+/headers
+--- response_headers
+Access-Control-Expose-Headers: *
+--- no_error_log
+[error]
+
+
+
+=== TEST 22: overwrite upstream(Access-Control-Max-Age)
+--- request
+GET /headers?Access-Control-Max-Age=10 HTTP/1.1
+--- more_headers
+Origin: https://sub.domain.com
+--- response_body
+/headers
+--- response_headers
+Access-Control-Max-Age: 5
+--- no_error_log
+[error]
+
+
+
+=== TEST 23: not overwrite upstream(Access-Control-Allow-Credentials)
+--- request
+GET /headers?Access-Control-Allow-Credentials=false HTTP/1.1
+--- more_headers
+Origin: https://sub.domain.com
+--- response_body
+/headers
+--- response_headers
+Access-Control-Allow-Credentials: true
+--- no_error_log
+[error]

Review comment:
   need one blank line at the end of file





This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] nic-chen commented on issue #1957: bug: return fail if failed to load SSL certificate by SNI

[GitBox]

nic-chen commented on issue #1957:
URL: 
https://github.com/apache/incubator-apisix/issues/1957#issuecomment-667191535


   @membphis  Ok, let me deal with this issue.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] nic-chen closed issue #1885: request help: need more prometheus metrics

[GitBox]

nic-chen closed issue #1885:
URL: https://github.com/apache/incubator-apisix/issues/1885


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] nic-chen commented on pull request #1943: feature: support etcd v3

[GitBox]

nic-chen commented on pull request #1943:
URL: https://github.com/apache/incubator-apisix/pull/1943#issuecomment-667212721


   
   Hi, @ChelinTsien, Thank you for your contribution!
   As @Yiyiyimu said, etcd v3 support is a task of `summer 2020`. He spent a 
lot of time studying and researching and  working with `APISIX` and 
`lua-resty-etcd`. And judging from the code submitted by this pr, I think he 
can do this job well. We should give him the opportunity to complete this task. 
You can help review the code, which is also a great contribution. What do you 
think?
   
   
   @Yiyiyimu etcd v3 support is an urgent need, we should hurry up and complete 
it as soon as possible.
   
   
   
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [incubator-apisix] ChelinTsien commented on pull request #1943: feature: support etcd v3

[GitBox]

ChelinTsien commented on pull request #1943:
URL: https://github.com/apache/incubator-apisix/pull/1943#issuecomment-667213575


   ok！
   
   nic-chen 于2020年8月1日 周六上午12:27写道：
   
   > Hi, @ChelinTsien , Thank you for your
   > contribution!
   > As @Yiyiyimu  said, etcd v3 support is a
   > task of summer 2020. He spent a lot of time studying and researching and
   > working with APISIX and lua-resty-etcd. And judging from the code
   > submitted by this pr, I think he can do this job well. We should give him
   > the opportunity to complete this task. You can help review the code, which
   > is also a great contribution. What do you think?
   >
   > @Yiyiyimu  etcd v3 support is an urgent
   > need, we should hurry up and complete it as soon as possible.
   >
   > —
   > You are receiving this because you were mentioned.
   > Reply to this email directly, view it on GitHub
   > 
,
   > or unsubscribe
   > 

   > .
   >
   -- 
   Best regards, 钱晓亮 厦门幻世网络科技有限公司 厦门市湖里区火炬园新丰二路8号（日华大厦）6F-E单元
   Fax:(86-592)5050712 Mobile:+86-18259285591
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] ChelinTsien edited a comment on pull request #1943: feature: support etcd v3

[GitBox]

ChelinTsien edited a comment on pull request #1943:
URL: https://github.com/apache/apisix/pull/1943#issuecomment-667213575


   ok！
   
   nic-chen 于2020年8月1日 周六上午12:27写道：
   
   > Hi, @ChelinTsien , Thank you for your
   > contribution!
   > As @Yiyiyimu  said, etcd v3 support is a
   > task of summer 2020. He spent a lot of time studying and researching and
   > working with APISIX and lua-resty-etcd. And judging from the code
   > submitted by this pr, I think he can do this job well. We should give him
   > the opportunity to complete this task. You can help review the code, which
   > is also a great contribution. What do you think?
   >
   > @Yiyiyimu  etcd v3 support is an urgent
   > need, we should hurry up and complete it as soon as possible.
   >
   > —
   > You are receiving this because you were mentioned.
   > Reply to this email directly, view it on GitHub
   > 
,
   > or unsubscribe
   > 

   > .
   >
   -- 
   Best regards
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] ChelinTsien commented on pull request #1943: feature: support etcd v3

[GitBox]

ChelinTsien commented on pull request #1943:
URL: https://github.com/apache/apisix/pull/1943#issuecomment-667219088


   Since the production environment uses apisix and apisix doesn't support etcd 
v3 at the moment so it took almost a day to deal with this issue, sorry for not 
seeing this assignment, agree with you!  @nic-chen



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] nic-chen commented on pull request #1943: feature: support etcd v3

[GitBox]

nic-chen commented on pull request #1943:
URL: https://github.com/apache/apisix/pull/1943#issuecomment-66783


   @ChelinTsien Thank you for your hard work and the understanding. ：）



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] Yiyiyimu commented on pull request #1943: feature: support etcd v3

[GitBox]

Yiyiyimu commented on pull request #1943:
URL: https://github.com/apache/apisix/pull/1943#issuecomment-667255004


   > @Yiyiyimu etcd v3 support is an urgent need, we should hurry up and 
complete it as soon as possible.
   
   Sure I'll try to provide the minimum working PR ASAP



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix] branch master updated: feat: add option for cors and bugfix (#1963)

[membphis]

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 2936c7d  feat: add option for cors and bugfix (#1963)
2936c7d is described below

commit 2936c7d89da2fb1d65c0984e03280b96d8ab3d95
Author: Vinci Xu <277040...@qq.com>
AuthorDate: Sat Aug 1 08:03:22 2020 +0800

feat: add option for cors and bugfix (#1963)

fix #1915 #1704
---
 apisix/plugins/cors.lua |  29 ++-
 t/lib/server.lua|   9 
 t/plugin/cors.t | 126 
 3 files changed, 153 insertions(+), 11 deletions(-)

diff --git a/apisix/plugins/cors.lua b/apisix/plugins/cors.lua
index 9fe91c9..5d827d2 100644
--- a/apisix/plugins/cors.lua
+++ b/apisix/plugins/cors.lua
@@ -64,7 +64,7 @@ local schema = {
 allow_credential = {
 type = "boolean",
 default = false
-},
+}
 }
 }
 
@@ -75,6 +75,7 @@ local _M = {
 schema = schema,
 }
 
+
 local function create_mutiple_origin_cache(conf)
 if not str_find(conf.allow_origins, ",", 1, true) then
 return nil
@@ -99,6 +100,7 @@ local function create_mutiple_origin_cache(conf)
 return origin_cache
 end
 
+
 function _M.check_schema(conf)
 local ok, err = core.schema.check(schema, conf)
 if not ok then
@@ -108,23 +110,32 @@ function _M.check_schema(conf)
 return true
 end
 
+
 local function set_cors_headers(conf, ctx)
 local allow_methods = conf.allow_methods
 if allow_methods == "**" then
 allow_methods = "GET,POST,PUT,DELETE,PATCH,HEAD,OPTIONS,CONNECT,TRACE"
 end
 
-ngx.header["Access-Control-Allow-Origin"] = ctx.cors_allow_origins
-ngx.header["Access-Control-Allow-Methods"] = allow_methods
-ngx.header["Access-Control-Allow-Headers"] = conf.allow_headers
-ngx.header["Access-Control-Max-Age"] = conf.max_age
+core.response.set_header("Access-Control-Allow-Origin", 
ctx.cors_allow_origins)
+core.response.set_header("Access-Control-Allow-Methods", allow_methods)
+core.response.set_header("Access-Control-Allow-Headers", 
conf.allow_headers)
+core.response.set_header("Access-Control-Max-Age", conf.max_age)
+core.response.set_header("Access-Control-Expose-Headers", 
conf.expose_headers)
 if conf.allow_credential then
-ngx.header["Access-Control-Allow-Credentials"] = true
+core.response.set_header("Access-Control-Allow-Credentials", true)
 end
-ngx.header["Access-Control-Expose-Headers"] = conf.expose_headers
 end
 
+
 function _M.rewrite(conf, ctx)
+if ctx.var.request_method == "OPTIONS" then
+return 200
+end
+end
+
+
+function _M.header_filter(conf, ctx)
 local allow_origins = conf.allow_origins
 local req_origin = core.request.header(ctx, "Origin")
 if allow_origins == "**" then
@@ -146,10 +157,6 @@ function _M.rewrite(conf, ctx)
 
 ctx.cors_allow_origins = allow_origins
 set_cors_headers(conf, ctx)
-
-if ctx.var.request_method == "OPTIONS" then
-return 200
-end
 end
 
 return _M
diff --git a/t/lib/server.lua b/t/lib/server.lua
index dfbead6..864a8e2 100644
--- a/t/lib/server.lua
+++ b/t/lib/server.lua
@@ -250,5 +250,14 @@ function _M.go()
 return _M[action]()
 end
 
+function _M.headers()
+local args = ngx.req.get_uri_args()
+for name, val in pairs(args) do
+ngx.header[name] = nil
+ngx.header[name] = val
+end
+
+ngx.say("/headers")
+end
 
 return _M
diff --git a/t/plugin/cors.t b/t/plugin/cors.t
index 364ae90..bc47705 100644
--- a/t/plugin/cors.t
+++ b/t/plugin/cors.t
@@ -491,3 +491,129 @@ Access-Control-Max-Age: 5
 Access-Control-Allow-Credentials:
 --- no_error_log
 [error]
+
+
+
+=== TEST 17: set route(overwrite upstream)
+--- config
+location /t {
+content_by_lua_block {
+local t = require("lib.test_admin").test
+local code, body = t('/apisix/admin/routes/1',
+ ngx.HTTP_PUT,
+ [[{
+"plugins": {
+"cors": {
+"allow_origins": "**",
+"allow_methods": "**",
+"allow_headers": "*",
+"expose_headers": "*",
+"allow_credential": true
+}
+},
+"upstream": {
+"nodes": {
+"127.0.0.1:1980": 1
+},
+"type": "roundrobin"
+},
+"uri": "/headers"
+}]]
+)
+
+if code >= 300 then
+ngx.status = code
+end
+ngx.say(body)
+}
+}
+--- request
+GET /t
+--- response_body
+passed
+--- 

[GitHub] [apisix] membphis closed issue #1915: bug: cors should be at header_filter phase

[GitBox]

membphis closed issue #1915:
URL: https://github.com/apache/apisix/issues/1915


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix] membphis merged pull request #1963: feat: add option for cors

[GitBox]

membphis merged pull request #1963:
URL: https://github.com/apache/apisix/pull/1963


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix] branch v1.5 updated (921fbe2 -> 6c5b52e)

[shuaijinchao]

This is an automated email from the ASF dual-hosted git repository.

shuaijinchao pushed a change to branch v1.5
in repository https://gitbox.apache.org/repos/asf/apisix.git.


 discard 921fbe2  release: released 1.5 version.
 add 1ffcc9c  doc: fixed grpc transcode link (#1946)
 add f37a1dd  doc(k8s): removed unnecessary configurations. (#1891)
 add 2ba0231  bugfix: passive health check seems never provide a healthy 
report (#1918)
 add 8fc2af5  bugfix: avoid to modify the original plugin conf. (#1958)
 add 3d8150b  test: old test case is unstable, running fail sometimes. 
(#1925)
 add 2936c7d  feat: add option for cors and bugfix (#1963)
 new 6c5b52e  release: released 1.5 version.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (921fbe2)
\
 N -- N -- N   refs/heads/v1.5 (6c5b52e)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README_CN.md   |   2 +-
 apisix/balancer.lua|   1 +
 apisix/init.lua|  57 -
 apisix/plugins/cors.lua|  29 +++--
 apisix/plugins/openid-connect.lua  |   3 +-
 apisix/plugins/redirect.lua|  19 +--
 apisix/plugins/uri-blocker.lua |  18 ++-
 apisix/plugins/zipkin.lua  |   4 +-
 kubernetes/README.md   |  19 +--
 kubernetes/apisix-gw-config-cm.yaml| 131 +
 .../config.sh  |  19 ++-
 kubernetes/deployment.yaml |  52 
 kubernetes/service-aliyun-slb.yaml |  78 
 t/lib/server.lua   |   9 ++
 ...eck-multiple-worker.t => healthcheck-passive.t} |  81 +
 t/node/invalid-upstream.t  |  60 ++
 t/plugin/cors.t| 126 
 t/plugin/uri-blocker.t |  22 ++--
 18 files changed, 341 insertions(+), 389 deletions(-)
 copy utils/check-lua-code-style.sh => kubernetes/config.sh (67%)
 delete mode 100644 kubernetes/service-aliyun-slb.yaml
 copy t/node/{healthcheck-multiple-worker.t => healthcheck-passive.t} (61%)

[apisix] 01/01: release: released 1.5 version.

[shuaijinchao]

This is an automated email from the ASF dual-hosted git repository.

shuaijinchao pushed a commit to branch v1.5
in repository https://gitbox.apache.org/repos/asf/apisix.git

commit 6c5b52e93ea522009355643feb9d8c5a84e4baf4
Author: Janko 
AuthorDate: Fri Jul 31 12:04:39 2020 +0800

release: released 1.5 version.
---
 CHANGELOG.md   | 42 
 CHANGELOG_CN.md| 43 
 README.md  |  9 ++---
 README_CN.md   |  9 ++---
 apisix/core/version.lua|  3 +-
 doc/how-to-build.md| 14 
 doc/zh-cn/how-to-build.md  | 14 
 rockspec/apisix-1.5-0.rockspec | 74 ++
 8 files changed, 184 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ef75ba..0a5424a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 # Table of Contents
 
 
+- [1.5.0](#150)
 - [1.4.1](#141)
 - [1.4.0](#140)
 - [1.3.0](#130)
@@ -32,6 +33,47 @@
 - [0.6.0](#060)
 
 
+## 1.5.0
+
+### Core
+- Admin API: support authentication with SSL certificates. 
[1747](https://github.com/apache/incubator-apisix/pull/1747)
+- Admin API: support both standard `PATCH` and sub path `PATCH`. 
[1930](https://github.com/apache/incubator-apisix/pull/1930)
+- HealthCheck: supports custom host port. 
[1914](https://github.com/apache/incubator-apisix/pull/1914)
+- Upstream: supports turning off the default retry mechanism. 
[1919](https://github.com/apache/incubator-apisix/pull/1919)
+- URI: supports delete the '/' at the end of the `URI`. 
[1766](https://github.com/apache/incubator-apisix/pull/1766)
+
+### New Plugin
+- :sunrise: **Request Validator** 
[1709](https://github.com/apache/incubator-apisix/pull/1709)
+
+### Improvements
+- change: nginx worker_shutdown_timeout is changed from 3s to recommended 
value 240s. [1883](https://github.com/apache/incubator-apisix/pull/1883)
+- change: the `healthcheck` timeout time type changed from `integer ` to 
`number`. [1892](https://github.com/apache/incubator-apisix/pull/1892)
+- change: the `request-validation` plugin input parameter supports `Schema` 
validation. [1920](https://github.com/apache/incubator-apisix/pull/1920)
+- change: add comments for Makefile `install` command. 
[1912](https://github.com/apache/incubator-apisix/pull/1912)
+- change: update comment for config.yaml `etcd.timeout` configuration. 
[1929](https://github.com/apache/incubator-apisix/pull/1929)
+- change: add more prometheus metrics. 
[1888](https://github.com/apache/incubator-apisix/pull/1888)
+
+### Bugfix
+- fixed: failed to get `host` in health check configuration. 
[1871](https://github.com/apache/incubator-apisix/pull/1871)
+- fixed: should not save the runtime data of plugin into `etcd`. 
[1910](https://github.com/apache/incubator-apisix/pull/1910)
+- fixed: run `apisix start` several times will start multi nginx processes. 
[1913](https://github.com/apache/incubator-apisix/pull/1913)
+- fixed: read the request body from the temporary file if it was cached. 
[1863](https://github.com/apache/incubator-apisix/pull/1863)
+- fixed: batch processor name and error return type. 
[1927](https://github.com/apache/incubator-apisix/pull/1927)
+- fixed: failed to read redis.ttl in `limit-count` plugin. 
[1928](https://github.com/apache/incubator-apisix/pull/1928)
+
+### Doc
+- doc: added APISIX Lua Coding Style Guide. 
[1874](https://github.com/apache/incubator-apisix/pull/1874)
+- doc: fixed link syntax in README.md. 
[1894](https://github.com/apache/incubator-apisix/pull/1894)
+- doc: fixed image links in zh-cn benchmark. 
[1896](https://github.com/apache/incubator-apisix/pull/1896)
+- doc: fixed typos in 
`FAQ`、`admin-api`、`architecture-design`、`discovery`、`prometheus`、`proxy-rewrite`、`redirect`、`http-logger`
 documents. [1916](https://github.com/apache/incubator-apisix/pull/1916)
+- doc: added improvements for OSx unit tests and request validation plugin. 
[1926](https://github.com/apache/incubator-apisix/pull/1926)
+- doc: fixed typos in `architecture-design` document. 
[1938](https://github.com/apache/incubator-apisix/pull/1938)
+- doc: added the default import path of `Nginx` for unit testing in `Linux` 
and `macOS` systems in the `how-to-build` document. 
[1936](https://github.com/apache/incubator-apisix/pull/1936)
+- doc: add `request-validation` plugin chinese document. 
[1932](https://github.com/apache/incubator-apisix/pull/1932)
+- doc: fixed file path of `gRPC transcoding` in `README`. 
[1945](https://github.com/apache/incubator-apisix/pull/1945)
+- doc: fixed `uri-blocker` plugin path error in `README`. 
[1950](https://github.com/apache/incubator-apisix/pull/1950)
+
+
 ## 1.4.1
 
 ### Bugfix
diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
index 3a9e844..16c03ec 100644
--- a/CHANGELOG_CN.md
+++ b/CHANGELOG_CN.md
@@ -19,6 +19,7 @@
 
 # Table of Contents
 
+- [1.5.0](#150)
 - [1.4.1](#141)
 - [1.4.0](#140)
 - [1.3.0](#130)
@@ -30

[GitHub] [apisix] membphis opened a new pull request #1964: doc: update main picture of APISIX.

[GitBox]

membphis opened a new pull request #1964:
URL: https://github.com/apache/apisix/pull/1964


   ### What this PR does / why we need it:
   
   
   
   Apache APISIX is TPL project, update main picture.
   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix] branch v1.5 updated: release: updated 1.5 version CHANGELOG.

[shuaijinchao]

This is an automated email from the ASF dual-hosted git repository.

shuaijinchao pushed a commit to branch v1.5
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/v1.5 by this push:
 new 48e07b0  release: updated 1.5 version CHANGELOG.
48e07b0 is described below

commit 48e07b0f015377cf1624bf4268fd591f08465735
Author: Janko 
AuthorDate: Sat Aug 1 09:49:40 2020 +0800

release: updated 1.5 version CHANGELOG.
---
 CHANGELOG.md| 6 ++
 CHANGELOG_CN.md | 6 ++
 2 files changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a5424a..c84b757 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@
 - change: add comments for Makefile `install` command. 
[1912](https://github.com/apache/incubator-apisix/pull/1912)
 - change: update comment for config.yaml `etcd.timeout` configuration. 
[1929](https://github.com/apache/incubator-apisix/pull/1929)
 - change: add more prometheus metrics. 
[1888](https://github.com/apache/incubator-apisix/pull/1888)
+- change: add more configuration options for `cors` plugin. 
[1963](https://github.com/apache/incubator-apisix/pull/1963)
 
 ### Bugfix
 - fixed: failed to get `host` in health check configuration. 
[1871](https://github.com/apache/incubator-apisix/pull/1871)
@@ -60,6 +61,9 @@
 - fixed: read the request body from the temporary file if it was cached. 
[1863](https://github.com/apache/incubator-apisix/pull/1863)
 - fixed: batch processor name and error return type. 
[1927](https://github.com/apache/incubator-apisix/pull/1927)
 - fixed: failed to read redis.ttl in `limit-count` plugin. 
[1928](https://github.com/apache/incubator-apisix/pull/1928)
+- fixed: passive health check seems never provide a healthy report. 
[1918](https://github.com/apache/incubator-apisix/pull/1918)
+- fixed: avoid to modify the original plugin conf. 
[1958](https://github.com/apache/incubator-apisix/pull/1958)
+- fixed: the test case of `invalid-upstream` is unstable and sometimes fails 
to run. [1925](https://github.com/apache/incubator-apisix/pull/1925) 
 
 ### Doc
 - doc: added APISIX Lua Coding Style Guide. 
[1874](https://github.com/apache/incubator-apisix/pull/1874)
@@ -72,6 +76,8 @@
 - doc: add `request-validation` plugin chinese document. 
[1932](https://github.com/apache/incubator-apisix/pull/1932)
 - doc: fixed file path of `gRPC transcoding` in `README`. 
[1945](https://github.com/apache/incubator-apisix/pull/1945)
 - doc: fixed `uri-blocker` plugin path error in `README`. 
[1950](https://github.com/apache/incubator-apisix/pull/1950)
+- doc: fixed `grpc-transcode` plugin path error in `README`. 
[1946](https://github.com/apache/incubator-apisix/pull/1946)
+- doc: removed unnecessary configurations for `k8s` document. 
[1891](https://github.com/apache/incubator-apisix/pull/1891)
 
 
 ## 1.4.1
diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
index 16c03ec..43ee6ae 100644
--- a/CHANGELOG_CN.md
+++ b/CHANGELOG_CN.md
@@ -51,6 +51,7 @@
 - 变更：为 Makefile `install` 
命令添加注释。[1912](https://github.com/apache/incubator-apisix/pull/1912)
 - 变更：更新 config.yaml `etcd.timeout` 
默认配置的注释。[1929](https://github.com/apache/incubator-apisix/pull/1929)
 - 变更：为 `prometheus` 添加更多度量指标，以更好地了解 `APISIX` 
节点的情况。[1888](https://github.com/apache/incubator-apisix/pull/1888)
+- 变更：为 `cors` 
插件添加更多配置选项。[1963](https://github.com/apache/incubator-apisix/pull/1963)
 
 ### Bugfix
 - 修复：`healthcheck` 获取 `host` 配置失败。 
[1871](https://github.com/apache/incubator-apisix/pull/1871)
@@ -59,6 +60,9 @@
 - 
修复：从临时文件读取请求正文（如果已缓存）。[1863](https://github.com/apache/incubator-apisix/pull/1863)
 - 修复：批处理器名称和错误返回类型。[1927](https://github.com/apache/incubator-apisix/pull/1927)
 - 修复：`limit-count` 插件 `redis.ttl` 
读取异常。[1928](https://github.com/apache/incubator-apisix/pull/1928)
+- 
修复：被动健康检查不能提供健康报告。[1918](https://github.com/apache/incubator-apisix/pull/1918)
+- 
修复：避免插件中直接修改或使用原始配置数据。[1958](https://github.com/apache/incubator-apisix/pull/1958)
+- 修复：`invalid-upstream` 
测试用例稳定性问题。[1925](https://github.com/apache/incubator-apisix/pull/1925)
 
 ### Doc
 - 文档：添加 `APISIX Lua` 
代码风格指南。[1874](https://github.com/apache/incubator-apisix/pull/1874)
@@ -71,6 +75,8 @@
 - 文档：添加 `request-validation` 
插件中文文档。[1932](https://github.com/apache/incubator-apisix/pull/1932)
 - 文档：修正 `README` 中 `gRPC transcoding` 
文档路径。[1945](https://github.com/apache/incubator-apisix/pull/1945)
 - 文档：修正 `README` 中 `uri-blocker` 
文档路径。[1950](https://github.com/apache/incubator-apisix/pull/1950)
+- 文档：修正 `README` 中 `grpc-transcode` 
文档路径。[1946](https://github.com/apache/incubator-apisix/pull/1946)
+- 文档: 删除 `k8s` 
文档中不必要的配置。[1891](https://github.com/apache/incubator-apisix/pull/1891)
 
 
 ## 1.4.1

[GitHub] [apisix] shuaijinchao commented on pull request #1948: release: released 1.5.0 version.

[GitBox]

shuaijinchao commented on pull request #1948:
URL: https://github.com/apache/apisix/pull/1948#issuecomment-667456115


   @moonming I will fix this issue later. Version 1.5-RC1 is voting, and the 
current release method of this branch is incorrect. I will close this PR.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix] branch v1.5 updated: release: updated 1.5 version package download path.

[shuaijinchao]

This is an automated email from the ASF dual-hosted git repository.

shuaijinchao pushed a commit to branch v1.5
in repository https://gitbox.apache.org/repos/asf/apisix.git


The following commit(s) were added to refs/heads/v1.5 by this push:
 new aaf7b2a  release: updated 1.5 version package download path.
aaf7b2a is described below

commit aaf7b2a6ccbec46f6b28dadd15b588adc387b29d
Author: Janko 
AuthorDate: Sat Aug 1 11:05:55 2020 +0800

release: updated 1.5 version package download path.
---
 README.md| 8 
 README_CN.md | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 660b989..7e6be32 100644
--- a/README.md
+++ b/README.md
@@ -125,12 +125,12 @@ There are several ways to install the Apache Release 
version of APISIX:
 - Installation runtime dependencies: OpenResty and etcd, and compilation 
dependencies: luarocks. Refer to [install dependencies 
documentation](doc/install-dependencies.md)
 - Download the latest source code release package:
 ```shell
-wget 
http://www.apache.org/dist/incubator/apisix/1.5/apache-apisix-1.5-incubating-src.tar.gz
-tar zxvf apache-apisix-1.5-incubating-src.tar.gz
+wget http://www.apache.org/dist/apisix/1.5/apache-apisix-1.5-src.tar.gz
+tar zxvf apache-apisix-1.5-src.tar.gz
 ```
 - Install the dependencies：
 ```shell
-cd apache-apisix-1.5-incubating
+cd apache-apisix-1.5
 make deps
 ```
 - check version of APISIX:
@@ -155,7 +155,7 @@ There are several ways to install the Apache Release 
version of APISIX:
 - Installation runtime dependencies: OpenResty and etcd, refer to [install 
dependencies documentation](doc/install-dependencies.md#centos-7)
 - install APISIX：
 ```shell
-sudo yum install -y 
https://github.com/apache/incubator-apisix/releases/download/1.5/apisix-1.5-0.el7.noarch.rpm
+sudo yum install -y 
https://github.com/apache/apisix/releases/download/1.5/apisix-1.5-0.el7.noarch.rpm
 ```
 - check version of APISIX:
 ```shell
diff --git a/README_CN.md b/README_CN.md
index 6aa1338..842af2b 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -124,12 +124,12 @@ CentOS 7, Ubuntu 16.04, Ubuntu 18.04, Debian 9, Debian 
10, macOS, **ARM64** Ubun
 - 安装运行时依赖：OpenResty 和 
etcd，以及编译的依赖：luarocks。参考[依赖安装文档](doc/zh-cn/install-dependencies.md)
 - 下载最新的源码发布包：
 ```shell
-wget 
http://www.apache.org/dist/incubator/apisix/1.5/apache-apisix-1.5-incubating-src.tar.gz
-tar zxvf apache-apisix-1.5-incubating-src.tar.gz
+wget http://www.apache.org/dist/apisix/1.5/apache-apisix-1.5-src.tar.gz
+tar zxvf apache-apisix-1.5-src.tar.gz
 ```
 - 安装运行时依赖的 Lua 库：
 ```shell
-cd apache-apisix-1.5-incubating
+cd apache-apisix-1.5
 make deps
 ```
 - 检查 APISIX 的版本号：
@@ -154,7 +154,7 @@ CentOS 7, Ubuntu 16.04, Ubuntu 18.04, Debian 9, Debian 10, 
macOS, **ARM64** Ubun
 - 安装依赖：OpenResty 和 
etcd，参考[依赖安装文档](doc/zh-cn/install-dependencies.md#centos-7)
 - 安装 APISIX：
 ```shell
-sudo yum install -y 
https://github.com/apache/incubator-apisix/releases/download/1.5/apisix-1.5-0.el7.noarch.rpm
+sudo yum install -y 
https://github.com/apache/apisix/releases/download/1.5/apisix-1.5-0.el7.noarch.rpm
 ```
 - 检查 APISIX 的版本号：
 ```shell

[GitHub] [apisix] shuaijinchao closed pull request #1948: release: released 1.5.0 version.

[GitBox]

shuaijinchao closed pull request #1948:
URL: https://github.com/apache/apisix/pull/1948


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[GitHub] [apisix-dashboard] juzhiyuan opened a new pull request #353: feat(conf): update default preview API

[GitBox]

juzhiyuan opened a new pull request #353:
URL: https://github.com/apache/apisix-dashboard/pull/353


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix-dashboard] branch juzhiyuan-patch-1 created (now 37f5d9b)

[juzhiyuan]

This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a change to branch juzhiyuan-patch-1
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git.


  at 37f5d9b  feat(conf): update default preview API

No new revisions were added by this update.

[GitHub] [apisix-dashboard] juzhiyuan merged pull request #353: feat(conf): update default preview API

[GitBox]

juzhiyuan merged pull request #353:
URL: https://github.com/apache/apisix-dashboard/pull/353


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix-dashboard] branch master updated: feat(conf): update default preview API (#353)

[juzhiyuan]

This is an automated email from the ASF dual-hosted git repository.

juzhiyuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git


The following commit(s) were added to refs/heads/master by this push:
 new b657493  feat(conf): update default preview API (#353)
b657493 is described below

commit b657493fbb7e65b9e36558f4346eb8febf9e176c
Author: 琚致远 
AuthorDate: Sat Aug 1 11:09:39 2020 +0800

feat(conf): update default preview API (#353)
---
 src/constants.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/constants.ts b/src/constants.ts
index 6e95a55..f99da28 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -32,5 +32,5 @@ export const codeMessage = {
   504: '网关超时。',
 };
 
-// TODO: 应作为配置项
-export const DEFAULT_BASE_URL = 'http://127.0.0.1:8080/apisix/admin';
+// NOTE: This is the Manager API Address, e.g 
http://127.0.0.1:8080/apisix/admin
+export const DEFAULT_BASE_URL = 'https://api.apisix.dev/apisix/admin';

[GitHub] [apisix] shuaijinchao opened a new pull request #1965: release: released 1.5.0 version.

[GitBox]

shuaijinchao opened a new pull request #1965:
URL: https://github.com/apache/apisix/pull/1965


   ### What this PR does / why we need it:
   released 1.5.0 version.
   @apache/apisix-committers please do have a check.
   @membphis After PR merge, please upload `apisix-1.5-0.rockspec` to 
https://luarocks.org/modules/apisix/apisix
   
   ### Pre-submission checklist:
   
   * [x] Did you explain what problem does this PR solve? Or what new features 
have been added?
   * [ ] Have you added corresponding test cases?
   * [x] Have you modified the corresponding document?
   * [x] Is this PR backward compatible?



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org

[apisix] branch v1.5 updated (aaf7b2a -> 261960b)

[shuaijinchao]

This is an automated email from the ASF dual-hosted git repository.

shuaijinchao pushed a change to branch v1.5
in repository https://gitbox.apache.org/repos/asf/apisix.git.


from aaf7b2a  release: updated 1.5 version package download path.
 add 261960b  release: remove trailing whitespace for CHANGELOG.

No new revisions were added by this update.

Summary of changes:
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)