diff options
| author |  Yuchen Zeng <zyc@google.com> | 2017-01-23 17:19:53 -0800 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2017-01-23 17:19:53 -0800 |
| commit | e38698e5bdb3c21dc63d1236d2111e0c4fbf4a20 (patch) | |
| tree | 61bc024713ecd469d446032b14bca52b6923b96e /doc | |
| parent | c09fd8c58a3cbaf991079f61dc0a98a815676f09 (diff) | |
| parent | 889b0a45352928e2a815c34d5f849be9641284b0 (diff) | |
Merge remote-tracking branch 'upstream/master' into cares_bazel_rule
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/PROTOCOL-HTTP2.md | 1 | ||||
| -rw-r--r-- | doc/environment_variables.md | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/PROTOCOL-HTTP2.md b/doc/PROTOCOL-HTTP2.md index 18803f2a09..2df1c74bee 100644 --- a/doc/PROTOCOL-HTTP2.md +++ b/doc/PROTOCOL-HTTP2.md @@ -153,6 +153,7 @@ DATA (flags = END_STREAM) HEADERS (flags = END_HEADERS) :status = 200 grpc-encoding = gzip +content-type = application/grpc+proto DATA <Length-Prefixed Message> diff --git a/doc/environment_variables.md b/doc/environment_variables.md index 9222cc305c..460f91d6bd 100644 --- a/doc/environment_variables.md +++ b/doc/environment_variables.md @@ -55,10 +55,12 @@ some configuration as environment variables that can be set. - secure_endpoint - traces bytes flowing through encrypted channels - transport_security - traces metadata about secure channel establishment - tcp - traces bytes in and out of a channel + 'all' can additionally be used to turn all traces on. Individual traces can be disabled by prefixing them with '-'. + Example: - export GRPC_TRACE=all,-pending_tags + export GRPC_TRACE=all,-pending_tags * GRPC_VERBOSITY Default gRPC logging verbosity - one of: |