aboutsummaryrefslogtreecommitdiffhomepage
path: root/doc/PROTOCOL-WEB.md
diff options
context:
space:
mode:
authorGravatar Muxi Yan <mxyan@google.com>2017-02-08 15:27:31 -0800
committerGravatar Muxi Yan <mxyan@google.com>2017-02-08 15:27:31 -0800
commitacbc5dd6ece72a1eb1032568a0061ef867b8b800 (patch)
treed991968fe7c2bf8154bef1b798b89bda68dd5719 /doc/PROTOCOL-WEB.md
parent40d7c627bde4c08d40568f62e6f284a6a615fb71 (diff)
parentda7b06c2f8d0dd89ab92589c55d5233f329083c5 (diff)
Merge remote-tracking branch 'upstream/master' into packet-coalescing-objc
Diffstat (limited to 'doc/PROTOCOL-WEB.md')
-rw-r--r--doc/PROTOCOL-WEB.md9
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/PROTOCOL-WEB.md b/doc/PROTOCOL-WEB.md
index 562d5999cf..35448d683f 100644
--- a/doc/PROTOCOL-WEB.md
+++ b/doc/PROTOCOL-WEB.md
@@ -60,21 +60,22 @@ HTTP/2 related behavior (specified in [gRPC over HTTP2](http://www.grpc.io/docs/
Message framing (vs. [http2-transport-mapping](http://www.grpc.io/docs/guides/wire.html#http2-transport-mapping))
1. Response status encoded as part of the response body
- * Key-value pairs encoded in the HTTP/2 [literal header format](https://tools.ietf.org/html/rfc7541#section-6.2) as a single header block.
+ * Key-value pairs encoded as a HTTP/1 headers block (without the terminating newline).
2. 8th (MSB) bit of the 1st gRPC frame byte
* 0: data
* 1: trailers
3. Trailers must be the last message of the response, as enforced
by the implementation
4. Trailers-only responses: no change to the gRPC protocol spec.
-Trailers will be sent together with response headers, with no message
+Trailers may be sent together with response headers, with no message
in the body.
---
-User Agent
+User Agent and Server headers
-* grpc-web-javascript/0.1
+* U-A: grpc-web-javascript/0.1
+* Server: grpc-web-gateway/0.1
---