diff options
| author |  vjpai <vpai@google.com> | 2015-07-10 19:48:17 -0700 |
|---|---|---|
| committer | vjpai <vpai@google.com> | 2015-07-10 19:48:17 -0700 |
| commit | a8822999840a7c550692b372ff93841fa43907bd (patch) | |
| tree | 0feda344bff960f3331f9f222a4cd0316e5e4099 /src/core/transport/chttp2/stream_encoder.c | |
| parent | 10a6546cb94373b7d57f3cb2d567edfbb0742d7c (diff) | |
| parent | 4547d503d37ade45866688dae3ce291ec8a450bd (diff) | |
Merge branch 'master' into lockfree-stack
Diffstat (limited to 'src/core/transport/chttp2/stream_encoder.c')
| -rw-r--r-- | src/core/transport/chttp2/stream_encoder.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/transport/chttp2/stream_encoder.c b/src/core/transport/chttp2/stream_encoder.c index 56ab82006a..d553d80085 100644 --- a/src/core/transport/chttp2/stream_encoder.c +++ b/src/core/transport/chttp2/stream_encoder.c @@ -437,7 +437,8 @@ static void deadline_enc(grpc_chttp2_hpack_compressor *c, gpr_timespec deadline, framer_state *st) { char timeout_str[GRPC_CHTTP2_TIMEOUT_ENCODE_MIN_BUFSIZE]; grpc_mdelem *mdelem; - grpc_chttp2_encode_timeout(gpr_time_sub(deadline, gpr_now()), timeout_str); + grpc_chttp2_encode_timeout( + gpr_time_sub(deadline, gpr_now(GPR_CLOCK_REALTIME)), timeout_str); mdelem = grpc_mdelem_from_metadata_strings( c->mdctx, GRPC_MDSTR_REF(c->timeout_key_str), grpc_mdstr_from_string(c->mdctx, timeout_str)); |