diff options
author | Craig Tiller <ctiller@google.com> | 2016-03-25 13:37:53 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-03-25 13:37:53 -0700 |
commit | b7b20fee9649c57df0aef8cb54f85465312bab80 (patch) | |
tree | cc81fb2d27594454e17cb023355a71c3c456f224 /src/core/transport/chttp2/timeout_encoding.c | |
parent | f29d1f77999a911a1ef2f4255cb286f860ba74ca (diff) | |
parent | bceec94ea4fc5f0085d81235d8e1c06798dc341a (diff) |
Merge github.com:grpc/grpc into clang_fmt_upd
Diffstat (limited to 'src/core/transport/chttp2/timeout_encoding.c')
-rw-r--r-- | src/core/transport/chttp2/timeout_encoding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/transport/chttp2/timeout_encoding.c b/src/core/transport/chttp2/timeout_encoding.c index a6f7081d21..c4802e050e 100644 --- a/src/core/transport/chttp2/timeout_encoding.c +++ b/src/core/transport/chttp2/timeout_encoding.c @@ -150,7 +150,7 @@ int grpc_chttp2_decode_timeout(const char *buffer, gpr_timespec *timeout) { /* spec allows max. 8 digits, but we allow values up to 1,000,000,000 */ if (x >= (100 * 1000 * 1000)) { if (x != (100 * 1000 * 1000) || digit != 0) { - *timeout = gpr_inf_future(GPR_CLOCK_REALTIME); + *timeout = gpr_inf_future(GPR_TIMESPAN); return 1; } } |