Commit 59f9f6398b3 for php.net

commit 59f9f6398b35ac0777d13cbfb499e82a08d59471
Merge: 4b79bbbe549 cd568cbcaa2
Author: Shivam Mathur <shivam_jpr@hotmail.com>
Date:   Thu Mar 26 12:15:17 2026 +0530

    Merge branch 'PHP-8.4' into PHP-8.5

    * PHP-8.4:
      Fix curl_setopt_ssl test for curl 8.19.0 (#21518)

diff --cc ext/curl/tests/curl_setopt_ssl.phpt
index 601e09d1f71,e3b97a3ea73..f3b82e1756e
--- a/ext/curl/tests/curl_setopt_ssl.phpt
+++ b/ext/curl/tests/curl_setopt_ssl.phpt
@@@ -99,8 -100,8 +100,8 @@@ try

      $response = curl_exec($ch);
      check_response($response, $clientCertSubject);
-     check_error($ch);
+     check_error($ch, $rejectsZeroLengthBlobs ? 56 : 58);
 -    curl_close($ch);
 +    $ch = null;

      echo "\n";
      echo "case 3: client cert and empty key from string\n";
@@@ -174,9 -175,9 +175,9 @@@
      curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

      $response = curl_exec($ch);
-     check_response($response, $clientCertSubject);
-     check_error($ch);
+     var_dump((is_string($response) && strpos($response, $clientCertSubject) !== false) === $rejectsZeroLengthBlobs);
+     var_dump(curl_errno($ch) === ($rejectsZeroLengthBlobs ? 0 : 83));
 -    curl_close($ch);
 +    $ch = null;

  } finally {
      // clean up server process