grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge github.com:grpc/grpc into propagate

This commit is contained in:
Craig Tiller 2015-08-05 10:44:45 -07:00
parent 0ba7e5e418 1451651e8c
commit 91763733b5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/server.cc
View File

@ -265,7 +265,7 @@ NAN_METHOD(Server::AddHttp2Port) {
grpc_server_credentials *creds = creds_object->GetWrappedServerCredentials(); grpc_server_credentials *creds = creds_object->GetWrappedServerCredentials();
int port; int port;
if (creds == NULL) { if (creds == NULL) {
port = grpc_server_add_http2_port(server->wrapped_server, port = grpc_server_add_insecure_http2_port(server->wrapped_server,
*NanUtf8String(args[0])); *NanUtf8String(args[0]));
} else { } else {
port = grpc_server_add_secure_http2_port(server->wrapped_server, port = grpc_server_add_secure_http2_port(server->wrapped_server,