diff options
| author |  yang-g <yangg@google.com> | 2015-12-09 11:26:43 -0800 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-12-09 11:26:43 -0800 |
| commit | 95ee0808835a41091bbb53bc4d891f4d2c3f3ec7 (patch) | |
| tree | 92004f506c664757d9672a431c99693b6192bb1a /src | |
| parent | fe9a975655735507b901787232a593122d01bce9 (diff) | |
| parent | 5efe9255c0f879f555fc9118e833bee513b14622 (diff) | |
merge with head
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/channel/http_server_filter.c | 1 | ||||
| -rw-r--r-- | src/core/surface/channel.c | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/channel/http_server_filter.c b/src/core/channel/http_server_filter.c index 4f43a35ba1..bc3a56cbf0 100644 --- a/src/core/channel/http_server_filter.c +++ b/src/core/channel/http_server_filter.c @@ -124,7 +124,6 @@ static grpc_mdelem *server_filter(void *user_data, grpc_mdelem *md) { omitted */ grpc_mdelem *authority = grpc_mdelem_from_metadata_strings( GRPC_MDSTR_AUTHORITY, GRPC_MDSTR_REF(md->value)); - GRPC_MDELEM_UNREF(md); calld->seen_authority = 1; return authority; } else { diff --git a/src/core/surface/channel.c b/src/core/surface/channel.c index 859197412b..14fe97c30d 100644 --- a/src/core/surface/channel.c +++ b/src/core/surface/channel.c @@ -113,7 +113,7 @@ grpc_channel *grpc_channel_create_from_filters( } } else if (0 == strcmp(args->args[i].key, GRPC_ARG_DEFAULT_AUTHORITY)) { if (args->args[i].type != GRPC_ARG_STRING) { - gpr_log(GPR_ERROR, "%s: must be an string", + gpr_log(GPR_ERROR, "%s ignored: it must be a string", GRPC_ARG_DEFAULT_AUTHORITY); } else { if (channel->default_authority) { @@ -126,13 +126,14 @@ grpc_channel *grpc_channel_create_from_filters( } else if (0 == strcmp(args->args[i].key, GRPC_SSL_TARGET_NAME_OVERRIDE_ARG)) { if (args->args[i].type != GRPC_ARG_STRING) { - gpr_log(GPR_ERROR, "%s: must be an string", + gpr_log(GPR_ERROR, "%s ignored: it must be a string", GRPC_SSL_TARGET_NAME_OVERRIDE_ARG); } else { if (channel->default_authority) { /* other ways of setting this (notably ssl) take precedence */ - gpr_log(GPR_ERROR, "%s: default host already set some other way", - GRPC_ARG_DEFAULT_AUTHORITY); + gpr_log(GPR_ERROR, + "%s ignored: default host already set some other way", + GRPC_SSL_TARGET_NAME_OVERRIDE_ARG); } else { channel->default_authority = grpc_mdelem_from_strings( ":authority", args->args[i].value.string); |