This is an automated email from the ASF dual-hosted git repository.
jamesge pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-brpc.git
The following commit(s) were added to refs/heads/master by this push:
new e5279ad Unify callings of http protocols
e5279ad is described below
commit e5279adaa94bcfb44ded18ac057287d764b62462
Author: Ge Jun <jge...@gmail.com>
AuthorDate: Wed Jun 19 05:20:15 2019 +0100
Unify callings of http protocols
---
docs/cn/client.md | 6 +++---
docs/cn/http_client.md | 4 ++--
docs/en/client.md | 6 +++---
docs/en/http_client.md | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/docs/cn/client.md b/docs/cn/client.md
index 8e0961a..616e8e1 100755
--- a/docs/cn/client.md
+++ b/docs/cn/client.md
@@ -599,7 +599,7 @@ Channel的默认协议是baidu_std，可通过设置ChannelOptions.protocol换
- PROTOCOL_HTTP 或 ”http", http/1.0或http/1.1协议，默认为连接池(Keep-Alive)。
- 访问普通http服务的方法见[访问http/h2服务](http_client.md)
- 通过http:json或http:proto访问pb服务的方法见[http/h2衍生协议](http_derivatives.md)
-- PROTOCOL_H2 或 ”h2", http/2.0协议，默认是单连接。
+- PROTOCOL_H2 或 ”h2", http/2协议，默认是单连接。
- 访问普通h2服务的方法见[访问http/h2服务](http_client.md)。
- 通过h2:json或h2:proto访问pb服务的方法见[http/h2衍生协议](http_derivatives.md)
- "h2:grpc",
[gRPC](https://grpc.io)的协议，也是h2的衍生协议，默认为单连接，具体见[h2:grpc](http_derivatives.md#h2grpc)。
@@ -620,8 +620,8 @@ Channel的默认协议是baidu_std，可通过设置ChannelOptions.protocol换
brpc支持以下连接方式：
--
短连接：每次RPC前建立连接，结束后关闭连接。由于每次调用得有建立连接的开销，这种方式一般用于偶尔发起的操作，而不是持续发起请求的场景。没有协议默认使用这种连接方式，http
1.0对连接的处理效果类似短链接。
-- 连接池：每次RPC前取用空闲连接，结束后归还，一个连接上最多只有一个请求，一个client对一台server可能有多条连接。http
1.1和各类使用nshead的协议都是这个方式。
+-
短连接：每次RPC前建立连接，结束后关闭连接。由于每次调用得有建立连接的开销，这种方式一般用于偶尔发起的操作，而不是持续发起请求的场景。没有协议默认使用这种连接方式，http/1.0对连接的处理效果类似短链接。
+-
连接池：每次RPC前取用空闲连接，结束后归还，一个连接上最多只有一个请求，一个client对一台server可能有多条连接。http/1.1和各类使用nshead的协议都是这个方式。
-
单连接：进程内所有client与一台server最多只有一个连接，一个连接上可能同时有多个请求，回复返回顺序和请求顺序不需要一致，这是baidu_std，hulu_pbrpc，sofa_pbrpc协议的默认选项。
| | 短连接 | 连接池
| 单连接 |
diff --git a/docs/cn/http_client.md b/docs/cn/http_client.md
index d669578..f551ebc 100644
--- a/docs/cn/http_client.md
+++ b/docs/cn/http_client.md
@@ -64,9 +64,9 @@ channel.CallMethod(NULL, &cntl, NULL, NULL, NULL/*done*/);
```
# 控制HTTP版本
-brpc的http行为默认是http 1.1。
+brpc的http行为默认是http/1.1。
-http 1.0相比1.1缺少长连接功能，brpc client与一些古老的http server通信时可能需要按如下方法设置为1.0。
+http/1.0相比http/1.1缺少长连接功能，brpc client与一些古老的http server通信时可能需要按如下方法设置为1.0。
```c++
cntl.http_request().set_version(1, 0);
```
diff --git a/docs/en/client.md b/docs/en/client.md
index eaf136e..8bd7fec 100644
--- a/docs/en/client.md
+++ b/docs/en/client.md
@@ -602,7 +602,7 @@ The default protocol used by Channel is baidu_std, which is
changeable by settin
- PROTOCOL_HTTP or "http", which is http/1.0 or http/1.1, using pooled
connection by default (Keep-Alive).
- Methods for accessing ordinary http services are listed in [Access
http/h2](http_client.md).
- Methods for accessing pb services by using http:json or http:proto are
listed in [http/h2 derivatives](http_derivatives.md)
-- PROTOCOL_H2 or ”h2", which is http/2.0, using single connection by default.
+- PROTOCOL_H2 or ”h2", which is http/2, using single connection by default.
- Methods for accessing ordinary h2 services are listed in [Access
http/h2](http_client.md).
- Methods for accessing pb services by using h2:json or h2:proto are listed
in [http/h2 derivatives](http_derivatives.md)
- "h2:grpc", which is the protocol of [gRPC](https://grpc.io) and based on h2,
using single connection by default, check out
[h2:grpc](http_derivatives.md#h2grpc) for details.
@@ -623,8 +623,8 @@ The default protocol used by Channel is baidu_std, which is
changeable by settin
brpc supports following connection types:
-- short connection: Established before each RPC, closed after completion.
Since each RPC has to pay the overhead of establishing connection, this type is
used for occasionally launched RPC, not frequently launched ones. No protocol
use this type by default. Connections in http 1.0 are handled similarly as
short connections.
-- pooled connection: Pick an unused connection from a pool before each RPC,
return after completion. One connection carries at most one request at the same
time. One client may have multiple connections to one server. http 1.1 and the
protocols using nshead use this type by default.
+- short connection: Established before each RPC, closed after completion.
Since each RPC has to pay the overhead of establishing connection, this type is
used for occasionally launched RPC, not frequently launched ones. No protocol
use this type by default. Connections in http/1.0 are handled similarly as
short connections.
+- pooled connection: Pick an unused connection from a pool before each RPC,
return after completion. One connection carries at most one request at the same
time. One client may have multiple connections to one server. http/1.1 and the
protocols using nshead use this type by default.
- single connection: all clients in one process has at most one connection to
one server, one connection may carry multiple requests at the same time. The
sequence of received responses does not need to be same as sending requests.
This type is used by baidu_std, hulu_pbrpc, sofa_pbrpc by default.
| | short connection
| pooled connection | single connection
|
diff --git a/docs/en/http_client.md b/docs/en/http_client.md
index 78c0bc3..a350aa2 100644
--- a/docs/en/http_client.md
+++ b/docs/en/http_client.md
@@ -65,9 +65,9 @@ channel.CallMethod(NULL, &cntl, NULL, NULL, NULL/*done*/);
# Change HTTP version
-brpc behaves as http 1.1 by default.
+brpc behaves as http/1.1 by default.
-Comparing to 1.1, http 1.0 lacks of long connections(KeepAlive). To
communicate brpc client with some legacy http servers, the client may be
configured as follows:
+Comparing to http/1.1, http/1.0 lacks of long connections(KeepAlive). To
communicate brpc client with some legacy http servers, the client may be
configured as follows:
```c++
cntl.http_request().set_version(1, 0);
```
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@brpc.apache.org
For additional commands, e-mail: dev-h...@brpc.apache.org
