diff options
| author |  ncteisen <ncteisen@gmail.com> | 2017-10-23 14:58:00 -0700 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2017-10-23 14:58:00 -0700 |
| commit | dfd16dd154e2f8ae42f002db396574002eb257f8 (patch) | |
| tree | f8df6a584c865fcc41a96b3fa7f434eced7dbe78 /src/core/ext/transport/chttp2/transport/parsing.cc | |
| parent | 3e3f806cff69a3a0a1df9f4098d76c5f13b32f38 (diff) | |
| parent | c563b583cb9b7fecc33971581368796d2df4759d (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into tracing++
Diffstat (limited to 'src/core/ext/transport/chttp2/transport/parsing.cc')
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/parsing.cc | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/core/ext/transport/chttp2/transport/parsing.cc b/src/core/ext/transport/chttp2/transport/parsing.cc index 43bf8fd254..28a14e11b5 100644 --- a/src/core/ext/transport/chttp2/transport/parsing.cc +++ b/src/core/ext/transport/chttp2/transport/parsing.cc @@ -435,19 +435,21 @@ static void on_initial_header(grpc_exec_ctx *exec_ctx, void *tp, grpc_millis *cached_timeout = static_cast<grpc_millis *>(grpc_mdelem_get_user_data(md, free_timeout)); grpc_millis timeout; - if (cached_timeout == NULL) { - /* not already parsed: parse it now, and store the result away */ - cached_timeout = (grpc_millis *)gpr_malloc(sizeof(grpc_millis)); - if (!grpc_http2_decode_timeout(GRPC_MDVALUE(md), cached_timeout)) { + if (cached_timeout != NULL) { + timeout = *cached_timeout; + } else { + if (!grpc_http2_decode_timeout(GRPC_MDVALUE(md), &timeout)) { char *val = grpc_slice_to_c_string(GRPC_MDVALUE(md)); gpr_log(GPR_ERROR, "Ignoring bad timeout value '%s'", val); gpr_free(val); - *cached_timeout = GRPC_MILLIS_INF_FUTURE; + timeout = GRPC_MILLIS_INF_FUTURE; + } + if (GRPC_MDELEM_IS_INTERNED(md)) { + /* store the result */ + cached_timeout = (grpc_millis *)gpr_malloc(sizeof(grpc_millis)); + *cached_timeout = timeout; + grpc_mdelem_set_user_data(md, free_timeout, cached_timeout); } - timeout = *cached_timeout; - grpc_mdelem_set_user_data(md, free_timeout, cached_timeout); - } else { - timeout = *cached_timeout; } if (timeout != GRPC_MILLIS_INF_FUTURE) { grpc_chttp2_incoming_metadata_buffer_set_deadline( |