aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/lib/http
diff options
context:
space:
mode:
authorGravatar Yash Tibrewal <yashkt@google.com>2017-12-05 17:49:11 -0800
committerGravatar Yash Tibrewal <yashkt@google.com>2017-12-05 17:49:11 -0800
commit73bb67d054ecb952f10649cc42c998ab7ea8facd (patch)
tree181ee31adc7a144d8dcffed5e5de990ab4662cef /src/core/lib/http
parent65c45fbb4d576d99bcd1c00a13f430c8994fee38 (diff)
parent05cd3102b7b59bf5d71f66dc012be1f4ecdaad88 (diff)
Merge master into execctx
Diffstat (limited to 'src/core/lib/http')
-rw-r--r--src/core/lib/http/httpcli_security_connector.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/lib/http/httpcli_security_connector.cc b/src/core/lib/http/httpcli_security_connector.cc
index 26599bc50a..bfb536a921 100644
--- a/src/core/lib/http/httpcli_security_connector.cc
+++ b/src/core/lib/http/httpcli_security_connector.cc
@@ -184,8 +184,9 @@ static void ssl_handshake(void* arg, grpc_endpoint* tcp, const char* host,
c->handshake_mgr = grpc_handshake_manager_create();
grpc_handshakers_add(HANDSHAKER_CLIENT, &args, c->handshake_mgr);
grpc_handshake_manager_do_handshake(
- c->handshake_mgr, tcp, nullptr /* channel_args */, deadline,
- nullptr /* acceptor */, on_handshake_done, c /* user_data */);
+ c->handshake_mgr, nullptr /* interested_parties */, tcp,
+ nullptr /* channel_args */, deadline, nullptr /* acceptor */,
+ on_handshake_done, c /* user_data */);
GRPC_SECURITY_CONNECTOR_UNREF(&sc->base, "httpcli");
}