diff options
| author |  murgatroid99 <mlumish@google.com> | 2015-08-11 17:28:42 -0700 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2015-08-11 17:28:42 -0700 |
| commit | 9e2b7c81b10f79085df25a27fd2ab4b37e7d00e5 (patch) | |
| tree | 6a98eedeb3353289bee6ea5b44af8cbb62e031fa /src/node/ext | |
| parent | a16b5ef455c63a18929b4ef90945e90f01c1fd58 (diff) | |
| parent | 9a2a3aecc8f7d667df0236df0367bb59a4ae37b1 (diff) | |
Resolved merge conflicts with master
Diffstat (limited to 'src/node/ext')
| -rw-r--r-- | src/node/ext/call.cc | 10 | ||||
| -rw-r--r-- | src/node/ext/server.cc | 4 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/node/ext/call.cc b/src/node/ext/call.cc index ab177e8513..c5c8313385 100644 --- a/src/node/ext/call.cc +++ b/src/node/ext/call.cc @@ -514,12 +514,14 @@ NAN_METHOD(Call::New) { if (args[3]->IsString()) { NanUtf8String host_override(args[3]); wrapped_call = grpc_channel_create_call( - wrapped_channel, CompletionQueueAsyncWorker::GetQueue(), *method, - *host_override, MillisecondsToTimespec(deadline)); + wrapped_channel, NULL, GRPC_PROPAGATE_DEFAULTS, + CompletionQueueAsyncWorker::GetQueue(), *method, + *host_override, MillisecondsToTimespec(deadline)); } else if (args[3]->IsUndefined() || args[3]->IsNull()) { wrapped_call = grpc_channel_create_call( - wrapped_channel, CompletionQueueAsyncWorker::GetQueue(), *method, - NULL, MillisecondsToTimespec(deadline)); + wrapped_channel, NULL, GRPC_PROPAGATE_DEFAULTS, + CompletionQueueAsyncWorker::GetQueue(), *method, + NULL, MillisecondsToTimespec(deadline)); } else { return NanThrowTypeError("Call's fourth argument must be a string"); } diff --git a/src/node/ext/server.cc b/src/node/ext/server.cc index 04fabc871d..1dc179db3d 100644 --- a/src/node/ext/server.cc +++ b/src/node/ext/server.cc @@ -265,8 +265,8 @@ NAN_METHOD(Server::AddHttp2Port) { grpc_server_credentials *creds = creds_object->GetWrappedServerCredentials(); int port; if (creds == NULL) { - port = grpc_server_add_http2_port(server->wrapped_server, - *NanUtf8String(args[0])); + port = grpc_server_add_insecure_http2_port(server->wrapped_server, + *NanUtf8String(args[0])); } else { port = grpc_server_add_secure_http2_port(server->wrapped_server, *NanUtf8String(args[0]), |