aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/node/interop/interop_server.js
diff options
context:
space:
mode:
authorGravatar Julien Boeuf <jboeuf@google.com>2015-08-24 23:55:43 -0700
committerGravatar Julien Boeuf <jboeuf@google.com>2015-08-24 23:55:43 -0700
commit0382bfae38ca7594e55e941087f8095eb7493a4e (patch)
tree925bd59036b7e27fb4ea4a7aa8d59862f413fc2b /src/node/interop/interop_server.js
parent8fd915ab8dfaf2a451fc46ecf225ea4d4400c64b (diff)
parente289e52436505e73440854ee6f8e5ddda5750929 (diff)
Merge branch 'master' of github.com:grpc/grpc into cpp_string_ref
Diffstat (limited to 'src/node/interop/interop_server.js')
-rw-r--r--src/node/interop/interop_server.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/node/interop/interop_server.js b/src/node/interop/interop_server.js
index 1242a0f939..99155e9958 100644
--- a/src/node/interop/interop_server.js
+++ b/src/node/interop/interop_server.js
@@ -169,8 +169,8 @@ function getServer(port, tls) {
var key_data = fs.readFileSync(key_path);
var pem_data = fs.readFileSync(pem_path);
server_creds = grpc.ServerCredentials.createSsl(null,
- key_data,
- pem_data);
+ [{private_key: key_data,
+ cert_chain: pem_data}]);
} else {
server_creds = grpc.ServerCredentials.createInsecure();
}