diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-26 12:37:53 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-26 12:37:53 -0700 |
| commit | dfc42da76011eec3270b3dbcc94748916e0aa5b2 (patch) | |
| tree | 5e1a69afefaaee7457ed1fa5796d00c06957757e /src/core/surface/call.c | |
| parent | b256faa353159c0b6f3477777bed75b4f9de3e16 (diff) | |
| parent | 5c575dd6e4b01cd68cca5d1917b58023dcf4ca0f (diff) | |
Merge github.com:grpc/grpc into sometimes-its-good-just-to-check-in-with-each-other
Conflicts:
src/core/iomgr/tcp_server_windows.c
Diffstat (limited to 'src/core/surface/call.c')
| -rw-r--r-- | src/core/surface/call.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/surface/call.c b/src/core/surface/call.c index aefcbad244..a1da822113 100644 --- a/src/core/surface/call.c +++ b/src/core/surface/call.c @@ -1373,7 +1373,8 @@ static void recv_metadata(grpc_call *call, grpc_metadata_batch *md) { l->md = 0; } } - if (gpr_time_cmp(md->deadline, gpr_inf_future(GPR_CLOCK_REALTIME)) != 0) { + if (gpr_time_cmp(md->deadline, gpr_inf_future(md->deadline.clock_type)) != + 0) { set_deadline_alarm(call, md->deadline); } if (!is_trailing) { |