mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-26 19:33:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Fix wrong merge
This commit is contained in:
Niels Dossche 2024-11-09 11:49:16 +01:00
commit ef1e1868ed
No known key found for this signature in database
GPG Key ID: B8A8AD166DF0E2E5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/openssl/openssl.c
View File

@ -3693,7 +3693,7 @@ static EVP_PKEY *php_openssl_pkey_from_zval(
/* it's an X509 file/cert of some kind, and we need to extract the data from that */
if (public_key) {
php_openssl_errors_set_mark();
cert = php_openssl_x509_from_str(Z_STR_P(val), arg_num, false, NULL);
cert = php_openssl_x509_from_str(val_str, arg_num, false, NULL);
if (cert) {
free_cert = 1;