diff options
| author |  Vijay Pai <vpai@google.com> | 2017-09-13 13:40:43 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-09-13 13:40:43 -0700 |
| commit | 0087d25e6078681b97d8aa200db189f6a0256d7d (patch) | |
| tree | 641db9259ef2c6d9535013aaeb470c511a9b8870 /src | |
| parent | 3bf7b714a5458aadfc1e2761ede1213f69ef7959 (diff) | |
| parent | b0ed7374b3a1a653612f0f5b5548964c56a93f35 (diff) | |
Merge pull request #12524 from vjpai/age_filter
Enable filter if either AGE or IDLE is specified; don't require both.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/ext/filters/max_age/max_age_filter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/filters/max_age/max_age_filter.c b/src/core/ext/filters/max_age/max_age_filter.c index 450f67746f..0ac803ed41 100644 --- a/src/core/ext/filters/max_age/max_age_filter.c +++ b/src/core/ext/filters/max_age/max_age_filter.c @@ -402,7 +402,7 @@ static bool maybe_add_max_age_filter(grpc_exec_ctx* exec_ctx, bool enable = grpc_channel_arg_get_integer( grpc_channel_args_find(channel_args, GRPC_ARG_MAX_CONNECTION_AGE_MS), - MAX_CONNECTION_AGE_INTEGER_OPTIONS) != INT_MAX && + MAX_CONNECTION_AGE_INTEGER_OPTIONS) != INT_MAX || grpc_channel_arg_get_integer( grpc_channel_args_find(channel_args, GRPC_ARG_MAX_CONNECTION_IDLE_MS), MAX_CONNECTION_IDLE_INTEGER_OPTIONS) != INT_MAX; |