Fix merge error

pull/8705/head
Craig Tiller 8 years ago
parent b995e8bcda
commit 1a7c57bf6c
  1. 2
      src/core/ext/transport/chttp2/server/chttp2_server.c
  2. 4
      src/core/lib/security/transport/security_handshaker.c

@ -165,7 +165,7 @@ static void on_handshake_done(grpc_exec_ctx *exec_ctx, void *arg,
connection_state->accepting_pollset, args->args);
grpc_chttp2_transport_start_reading(exec_ctx, transport,
args->read_buffer);
grpc_channel_args_destroy(args->args);
grpc_channel_args_destroy(exec_ctx, args->args);
}
}
pending_handshake_manager_remove_locked(connection_state->server_state,

@ -132,14 +132,10 @@ static void security_handshake_failed_locked(grpc_exec_ctx *exec_ctx,
grpc_endpoint_shutdown(exec_ctx, h->args->endpoint);
// Not shutting down, so the write failed. Clean up before
// invoking the callback.
<<<<<<< HEAD
cleanup_args_for_failure_locked(exec_ctx, h);
=======
cleanup_args_for_failure_locked(h);
// Set shutdown to true so that subsequent calls to
// security_handshaker_shutdown() do nothing.
h->shutdown = true;
>>>>>>> b62bffbea5eef106bfbe644e8af161889c927401
}
// Invoke callback.
grpc_exec_ctx_sched(exec_ctx, h->on_handshake_done, error, NULL);

Loading…
Cancel
Save