diff options
| author |  Yang Gao <yangg@google.com> | 2015-07-23 16:35:29 -0700 |
|---|---|---|
| committer | Yang Gao <yangg@google.com> | 2015-07-23 16:35:29 -0700 |
| commit | b5bbf667798f28d960edd6f1145d9479a3b39831 (patch) | |
| tree | 9774314bc3a0388d6ba769d5da274417a56a717b /src/core/transport | |
| parent | 2e7ce156354f77bcbdfe0c096b6fa29ebe320200 (diff) | |
| parent | 94329d09656f3eeb8eee40b72b96ec9cd3578559 (diff) | |
Merge pull request #2629 from ctiller/always-with-the-mono
Make the server report monotonic times for deadlines
Diffstat (limited to 'src/core/transport')
| -rw-r--r-- | src/core/transport/chttp2/parsing.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/transport/chttp2/parsing.c b/src/core/transport/chttp2/parsing.c index 904b9afce7..50a2f752f6 100644 --- a/src/core/transport/chttp2/parsing.c +++ b/src/core/transport/chttp2/parsing.c @@ -607,7 +607,7 @@ static void on_header(void *tp, grpc_mdelem *md) { } grpc_chttp2_incoming_metadata_buffer_set_deadline( &stream_parsing->incoming_metadata, - gpr_time_add(gpr_now(GPR_CLOCK_REALTIME), *cached_timeout)); + gpr_time_add(gpr_now(GPR_CLOCK_MONOTONIC), *cached_timeout)); GRPC_MDELEM_UNREF(md); } else { grpc_chttp2_incoming_metadata_buffer_add(&stream_parsing->incoming_metadata, |