aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorGravatar Craig Tiller <craig.tiller@gmail.com>2015-12-09 10:48:23 -0800
committerGravatar Craig Tiller <craig.tiller@gmail.com>2015-12-09 10:48:23 -0800
commitf931f58f18be3e453110a28ef0aca7587d92b987 (patch)
tree2995a7653a09518f8222a187a209fb6925f9044d /src
parent6eee3ddfb8a73ca9a5835acce9062466cad28014 (diff)
parentae109b5d8a1a07f4f9afe631a83bc398a49fe0cc (diff)
Merge github.com:grpc/grpc into secsvr
Diffstat (limited to 'src')
-rw-r--r--src/core/transport/chttp2/parsing.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/transport/chttp2/parsing.c b/src/core/transport/chttp2/parsing.c
index eb2cb6b4c2..7604e7b681 100644
--- a/src/core/transport/chttp2/parsing.c
+++ b/src/core/transport/chttp2/parsing.c
@@ -604,7 +604,7 @@ static void on_initial_header(void *tp, grpc_mdelem *md) {
cached_timeout)) {
gpr_log(GPR_ERROR, "Ignoring bad timeout value '%s'",
grpc_mdstr_as_c_string(md->value));
- *cached_timeout = gpr_inf_future(GPR_CLOCK_REALTIME);
+ *cached_timeout = gpr_inf_future(GPR_TIMESPAN);
}
grpc_mdelem_set_user_data(md, free_timeout, cached_timeout);
}