diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-11-22 15:43:56 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-11-22 15:43:56 -0800 |
| commit | 0960818e546f63131522def31838848370467c25 (patch) | |
| tree | 50b819ea00b0c0ffbdd78f4c1171816c420dcb5c /src/core/lib/channel/http_server_filter.c | |
| parent | b0f3bca0ef9ee8c1ea6bb2bde7281a1df5914216 (diff) | |
bm_fullstack runs
Diffstat (limited to 'src/core/lib/channel/http_server_filter.c')
| -rw-r--r-- | src/core/lib/channel/http_server_filter.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/core/lib/channel/http_server_filter.c b/src/core/lib/channel/http_server_filter.c index 10b386a2f0..07c67e54c1 100644 --- a/src/core/lib/channel/http_server_filter.c +++ b/src/core/lib/channel/http_server_filter.c @@ -99,7 +99,11 @@ static grpc_error *server_filter_outgoing_metadata(grpc_exec_ctx *exec_ctx, static void add_error(const char *error_name, grpc_error **cumulative, grpc_error *new) { - abort(); + if (new == GRPC_ERROR_NONE) return; + if (*cumulative == GRPC_ERROR_NONE) { + *cumulative = GRPC_ERROR_CREATE(error_name); + } + *cumulative = grpc_error_add_child(*cumulative, new); } static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx, @@ -145,12 +149,12 @@ static grpc_error *server_filter_incoming_metadata(grpc_exec_ctx *exec_ctx, } if (b->idx.named.scheme != NULL) { - if (!grpc_mdelem_eq(b->idx.named.te->md, GRPC_MDELEM_SCHEME_HTTP) && - !grpc_mdelem_eq(b->idx.named.te->md, GRPC_MDELEM_SCHEME_HTTPS) && - !grpc_mdelem_eq(b->idx.named.te->md, GRPC_MDELEM_SCHEME_GRPC)) { + if (!grpc_mdelem_eq(b->idx.named.scheme->md, GRPC_MDELEM_SCHEME_HTTP) && + !grpc_mdelem_eq(b->idx.named.scheme->md, GRPC_MDELEM_SCHEME_HTTPS) && + !grpc_mdelem_eq(b->idx.named.scheme->md, GRPC_MDELEM_SCHEME_GRPC)) { add_error(error_name, &error, grpc_attach_md_to_error(GRPC_ERROR_CREATE("Bad header"), - b->idx.named.te->md)); + b->idx.named.scheme->md)); } grpc_metadata_batch_remove(b, b->idx.named.scheme); } else { |