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

Fix merge error with proxy fixes

This commit is contained in:
Michael Lumish 2020-04-20 11:22:56 -07:00
parent 5aa7817c7e
commit 98e46260ef
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grpc-js/src/http_proxy.ts
View File

@ -213,7 +213,7 @@ export function getProxiedConnection(
* See https://github.com/grpc/grpc-node/pull/1369 for more info. */ * See https://github.com/grpc/grpc-node/pull/1369 for more info. */
const cts = tls.connect({ const cts = tls.connect({
...connectionOptions, ...connectionOptions,
host: getDefaultAuthority(realTarget), host: getDefaultAuthority(parsedTarget),
socket: socket, socket: socket,
}, () => { }, () => {
resolve({ socket: cts, realTarget: parsedTarget }); resolve({ socket: cts, realTarget: parsedTarget });