Skip to content

[pull] master from php:master #814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Mar 26, 2026
+10 −9
Merged

[pull] master from php:master #814

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd568cb
Fix curl_setopt_ssl test for curl 8.19.0 (#21518)
shivammathur Mar 26, 2026
59f9f63
Merge branch 'PHP-8.4' into PHP-8.5
shivammathur Mar 26, 2026
f6f6fa9
Merge branch 'PHP-8.5'
shivammathur Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions ext/curl/tests/curl_setopt_ssl.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ function check_response($response, $clientCertSubject) {
}

$clientCertSubject = "Subject: C=US, ST=TX, L=Clientlocation, O=Clientcompany, CN=clientname/emailAddress=test@example.com";
$rejectsZeroLengthBlobs = curl_version()['version_number'] >= 0x081300;

// load server cert
$serverCertPath = __DIR__ . DIRECTORY_SEPARATOR . 'curl_setopt_ssl_servercert.pem';
Expand Down Expand Up @@ -91,22 +92,22 @@ try {
echo "\n";
echo "case 2: empty client cert and key from string\n";
$ch = curl_init("https://127.0.0.1:$port/");
var_dump(curl_setopt($ch, CURLOPT_SSLCERT_BLOB, ''));
var_dump(curl_setopt($ch, CURLOPT_SSLCERT_BLOB, '') === !$rejectsZeroLengthBlobs);
var_dump(curl_setopt($ch, CURLOPT_SSLKEY_BLOB, $clientKey));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false));
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);

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

echo "\n";
echo "case 3: client cert and empty key from string\n";
$ch = curl_init("https://127.0.0.1:$port/");
var_dump(curl_setopt($ch, CURLOPT_SSLCERT_BLOB, $clientCert));
var_dump(curl_setopt($ch, CURLOPT_SSLKEY_BLOB, ''));
var_dump(curl_setopt($ch, CURLOPT_SSLKEY_BLOB, '') === !$rejectsZeroLengthBlobs);
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false));
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
Expand Down Expand Up @@ -166,16 +167,16 @@ try {
echo "case 7: empty issuer cert from string\n";
$ch = curl_init("https://127.0.0.1:$port/");
var_dump(curl_setopt($ch, CURLOPT_CAINFO, $serverCertPath));
var_dump(curl_setopt($ch, CURLOPT_ISSUERCERT_BLOB, ''));
var_dump(curl_setopt($ch, CURLOPT_ISSUERCERT_BLOB, '') === !$rejectsZeroLengthBlobs);
var_dump(curl_setopt($ch, CURLOPT_SSLCERT, $clientCertPath));
var_dump(curl_setopt($ch, CURLOPT_SSLKEY, $clientKeyPath));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true));
var_dump(curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false));
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));
$ch = null;

} finally {
Expand All @@ -199,7 +200,7 @@ bool(true)
bool(true)
bool(true)
client cert subject not in response
CURL ERROR: 58
CURL ERROR: EXPECTED

case 3: client cert and empty key from string
bool(true)
Expand Down Expand Up @@ -241,5 +242,5 @@ bool(true)
bool(true)
bool(true)
bool(true)
client cert subject not in response
CURL ERROR: 83
bool(true)
bool(true)