diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-04-19 22:07:51 +0000 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-04-19 22:07:51 +0000 |
| commit | 9247817082bc5d33ebe048a1aa0c5881fdb408ed (patch) | |
| tree | b3d38b4ba2b7df6a754c52ce1ace7ae96e4e36f0 /src/core | |
| parent | 2b465f00e94f8b5073ab913e7110c51a0ffbc62b (diff) | |
| parent | feaee850bf82251f3797749f9b2ef4580b1ba002 (diff) | |
Merge github.com:grpc/grpc into trickle_stall
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c | 2 | ||||
| -rw-r--r-- | src/core/tsi/ssl_transport_security.c | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c index ff8d319309..291a1f1b0b 100644 --- a/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c +++ b/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb.c @@ -1122,6 +1122,7 @@ static void lb_call_init_locked(grpc_exec_ctx *exec_ctx, glb_policy->base.interested_parties, GRPC_MDSTR_SLASH_GRPC_DOT_LB_DOT_V1_DOT_LOADBALANCER_SLASH_BALANCELOAD, &host, glb_policy->deadline, NULL); + grpc_slice_unref_internal(exec_ctx, host); grpc_metadata_array_init(&glb_policy->lb_initial_metadata_recv); grpc_metadata_array_init(&glb_policy->lb_trailing_metadata_recv); @@ -1293,6 +1294,7 @@ static void lb_on_response_received_locked(grpc_exec_ctx *exec_ctx, void *arg, "Received empty server list. Picks will stay pending until a " "response with > 0 servers is received"); } + grpc_grpclb_destroy_serverlist(glb_policy->serverlist); } } else { /* serverlist == NULL */ gpr_log(GPR_ERROR, "Invalid LB response received: '%s'. Ignoring.", diff --git a/src/core/tsi/ssl_transport_security.c b/src/core/tsi/ssl_transport_security.c index 984f745b01..5f4705db92 100644 --- a/src/core/tsi/ssl_transport_security.c +++ b/src/core/tsi/ssl_transport_security.c @@ -45,6 +45,7 @@ #include <ws2tcpip.h> #else #include <arpa/inet.h> +#include <sys/socket.h> #endif #include <grpc/support/alloc.h> |