Merge branch 'PHP-7.2' into PHP-7.3

nikic · nikic · commit 37bba7a678fd · 2019-06-03T15:15:07.000+02:00
diff --git 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;
 			}

Original file line number	Diff line number	Diff line change
`@@ -875,6 +875,7 @@ static int php_openssl_enable_peer_verification(SSL_CTX ctx, php_stream stream`
`875`	`875`
`876`	`876`	`if (cafile \|\| capath) {`
`877`	`877`	`if (!SSL_CTX_load_verify_locations(ctx, cafile, capath)) {`
	`878`	`+ ERR_clear_error();`
`878`	`879`	`if (cafile && !php_openssl_load_stream_cafile(SSL_CTX_get_cert_store(ctx), cafile)) {`
`879`	`880`	`return FAILURE;`
`880`	`881`	`}`