diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-03 15:15:07 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-03 15:15:07 +0200 |
| commit | 37bba7a678fdf2028ef6e27a939aae5dd1ec4d09 (patch) | |
| tree | c31797246e403de1ce47b52aa65aeee5906cb96c | |
| parent | 8f69ca8dcd926aab855a36019e7a325e74239a0b (diff) | |
| parent | ac60007becc7943d1da95ec0f9f92c6a3325ec72 (diff) | |
| download | php-git-37bba7a678fdf2028ef6e27a939aae5dd1ec4d09.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | ext/openssl/xp_ssl.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/openssl/xp_ssl.c b/ext/openssl/xp_ssl.c index 7456ee140a..152afeb245 100644 --- a/ext/openssl/xp_ssl.c +++ b/ext/openssl/xp_ssl.c @@ -875,6 +875,7 @@ static int php_openssl_enable_peer_verification(SSL_CTX *ctx, php_stream *stream if (cafile || capath) { if (!SSL_CTX_load_verify_locations(ctx, cafile, capath)) { + ERR_clear_error(); if (cafile && !php_openssl_load_stream_cafile(SSL_CTX_get_cert_store(ctx), cafile)) { return FAILURE; } |