commit 5cf7013c4b736c23ab0ad0d1337ff4b0e78d5748
author Craig Tiller <ctiller@google.com> Thu Sep 24 11:34:23 2015 -0700
committer Craig Tiller <ctiller@google.com> Thu Sep 24 11:34:23 2015 -0700
tree 3fc84234d9c19361fa5dca23f4610e33c9f4ebf5
parent f8b14ca5f24448767c8627bb11508ba91ce608a0

Merge

src/core/channel/http_server_filter.c

diff --git a/src/core/channel/http_server_filter.c b/src/core/channel/http_server_filter.c
index d3c6012..7a6a89e 100644
--- a/src/core/channel/http_server_filter.c
+++ b/src/core/channel/http_server_filter.c
@@ -202,7 +202,7 @@
       calld->sent_status = 1;
       grpc_metadata_batch_add_head(&stream_op->data.metadata, &calld->status,
                                    GRPC_MDELEM_REF(channeld->status_ok));
-      grpc_metadata_batch_add_tail(&op->data.metadata, &calld->content_type,
+      grpc_metadata_batch_add_tail(&stream_op->data.metadata, &calld->content_type,
                                    GRPC_MDELEM_REF(channeld->content_type));
       break;
     }