diff options
| author |  Mark D. Roth <roth@google.com> | 2016-10-07 09:42:51 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-10-07 09:42:51 -0700 |
| commit | 499b0121032a2c04299c2c5eaa75a83cd06d5b99 (patch) | |
| tree | c72b55f34ea84254a9b72c53cb3df7ff554bc90e /src/core | |
| parent | afae7217324da85cf351c00aedae8e3736bcbcda (diff) | |
| parent | e5c744d9850a763639b2e7001cf2487e1c76133b (diff) | |
Merge remote-tracking branch 'upstream/master' into service_config
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ext/transport/cronet/transport/cronet_transport.c | 2 | ||||
| -rw-r--r-- | src/core/lib/iomgr/error.h | 8 |
2 files changed, 9 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 f7f57ac825..00a5be419e 100644 --- a/src/core/ext/transport/cronet/transport/cronet_transport.c +++ b/src/core/ext/transport/cronet/transport/cronet_transport.c @@ -781,7 +781,7 @@ static enum e_op_result execute_stream_op(grpc_exec_ctx *exec_ctx, &cronet_callbacks); CRONET_LOG(GPR_DEBUG, "%p = cronet_bidirectional_stream_create()", s->cbs); char *url = NULL; - const char *method = NULL; + const char *method = "POST"; s->header_array.headers = NULL; convert_metadata_to_cronet_headers( stream_op->send_initial_metadata->list.head, s->curr_ct.host, &url, diff --git a/src/core/lib/iomgr/error.h b/src/core/lib/iomgr/error.h index 7e2fd7a3bd..00ace8a7a9 100644 --- a/src/core/lib/iomgr/error.h +++ b/src/core/lib/iomgr/error.h @@ -40,6 +40,10 @@ #include <grpc/status.h> #include <grpc/support/time.h> +#ifdef __cplusplus +extern "C" { +#endif + /// Opaque representation of an error. /// Errors are refcounted objects that represent the result of an operation. /// Ownership laws: @@ -204,4 +208,8 @@ bool grpc_log_if_error(const char *what, grpc_error *error, const char *file, #define GRPC_LOG_IF_ERROR(what, error) \ grpc_log_if_error((what), (error), __FILE__, __LINE__) +#ifdef __cplusplus +} +#endif + #endif /* GRPC_CORE_LIB_IOMGR_ERROR_H */ |