Merge pull request #18438 from yihuazhang/fix_php_test_failure

Fix php PersistentListTest test
pull/18460/head
yihuaz 6 years ago committed by GitHub
commit b245ad4ae8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      src/core/lib/security/security_connector/ssl/ssl_security_connector.cc

@ -319,6 +319,11 @@ grpc_ssl_channel_security_connector_create(
gpr_log(GPR_ERROR, "An ssl channel needs a config and a target name."); gpr_log(GPR_ERROR, "An ssl channel needs a config and a target name.");
return nullptr; return nullptr;
} }
if (config->pem_root_certs == nullptr &&
grpc_core::DefaultSslRootStore::GetPemRootCerts() == nullptr) {
gpr_log(GPR_ERROR, "Could not get pem root certs.");
return nullptr;
}
grpc_core::RefCountedPtr<grpc_ssl_channel_security_connector> c = grpc_core::RefCountedPtr<grpc_ssl_channel_security_connector> c =
grpc_core::MakeRefCounted<grpc_ssl_channel_security_connector>( grpc_core::MakeRefCounted<grpc_ssl_channel_security_connector>(
std::move(channel_creds), std::move(request_metadata_creds), config, std::move(channel_creds), std::move(request_metadata_creds), config,

Loading…
Cancel
Save