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 dffc517 docs: clarify the default value of Upstream.pass_host (#3468) dffc517 is described below commit dffc5178a15b1677894d7630f114a465e0a214ed Author: 罗泽轩 <spacewander...@gmail.com> AuthorDate: Mon Feb 1 19:22:20 2021 +0800 docs: clarify the default value of Upstream.pass_host (#3468) Fix #2134 --- doc/admin-api.md | 2 +- doc/zh-cn/admin-api.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/admin-api.md b/doc/admin-api.md index 29eae70..f1cc0c5 100644 --- a/doc/admin-api.md +++ b/doc/admin-api.md @@ -522,7 +522,7 @@ In addition to the basic complex equalization algorithm selection, APISIX's Upst |timeout|optional| Set the timeout for connection, sending and receiving messages. | |name |optional|Identifies upstream names| |desc |optional|upstream usage scenarios, and more.| -|pass_host |optional|`pass` pass the client request host, `node` not pass the client request host, using the upstream node host, `rewrite` rewrite host by the configured `upstream_host`.| +|pass_host |optional|`pass` pass the client request host, `node` not pass the client request host, using the upstream node host, `rewrite` rewrite host by the configured `upstream_host`. Default to `pass`.| |upstream_host |optional|This option is only valid if the `pass_host` is `rewrite`.| |scheme|optional |The scheme used when talk with the upstream. The value is one of ['http', 'https', 'grpc', 'grpcs'], default to 'http'.| |labels|optional |Key/value pairs to specify attributes|{"version":"v2","build":"16","env":"production"}| diff --git a/doc/zh-cn/admin-api.md b/doc/zh-cn/admin-api.md index 771b072..024550d 100644 --- a/doc/zh-cn/admin-api.md +++ b/doc/zh-cn/admin-api.md @@ -531,7 +531,7 @@ APISIX 的 Upstream 除了基本的复杂均衡算法选择外,还支持对上 |hash_on |可选|辅助|`hash_on` 支持的类型有 `vars`(Nginx内置变量),`header`(自定义header),`cookie`,`consumer`,默认值为 `vars`| |name |可选 |辅助|标识上游服务名称、使用场景等。|| |desc |可选 |辅助|上游服务描述、使用场景等。|| -|pass_host |可选|枚举|`pass` 透传客户端请求的 host, `node` 不透传客户端请求的 host, 使用 upstream node 配置的 host, `rewrite` 使用 `upstream_host` 配置的值重写 host 。|| +|pass_host |可选|枚举|`pass` 透传客户端请求的 host, `node` 不透传客户端请求的 host, 使用 upstream node 配置的 host, `rewrite` 使用 `upstream_host` 配置的值重写 host 。默认为 `pass`。|| |upstream_host |可选|辅助|只在 `pass_host` 配置为 `rewrite` 时有效。|| |scheme|可选 |辅助|跟上游通信时使用的 scheme。需要是 ['http', 'https', 'grpc', 'grpcs'] 其中的一个,默认是 'http'。| |labels |可选 |匹配规则|标识附加属性的键值对|{"version":"v2","build":"16","env":"production"}|