diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-10-06 11:16:12 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-10-06 11:16:12 -0700 |
| commit | 8dc4193e6ac17e242929ca737139a160ec4b29fa (patch) | |
| tree | 138955b13b276e58692f54b81fcd7861b6c4697f | |
| parent | 4552f6aad888878fb15b292c134b5d90233d5491 (diff) | |
| parent | 3a9f49d409d5fa552ea6053eedfa0a8e27d160e0 (diff) | |
Resolve conflicts
| -rw-r--r-- | src/core/ext/transport/cronet/transport/cronet_transport.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/ext/transport/cronet/transport/cronet_transport.c b/src/core/ext/transport/cronet/transport/cronet_transport.c index 4431d58351..00a5be419e 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.c +++ b/src/core/ext/transport/cronet/transport/cronet_transport.c @@ -780,7 +780,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, s->cbs = cronet_bidirectional_stream_create(s->curr_ct.engine, s->curr_gs, &cronet_callbacks); CRONET_LOG(GPR_DEBUG, "%p = cronet_bidirectional_stream_create()", s->cbs); - char *url; + char *url = NULL; const char *method = "POST"; s->header_array.headers = NULL; convert_metadata_to_cronet_headers( |