php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.3' into PHP-8.4

Browse Source 
* PHP-8.3:
  Update NEWS entry for curl 8.16 update
  Update NEWS with info about curl 8.16 compat fixes
  Fix curl_setopt_ssl test for curl 8.16
  Fix more curl 8.16 issues
  Fix curl 8.16.0 compilation with zts
  Fix curl build failure on macOS+curl 8.16
This commit is contained in:
Jakub Zelenka
2025-10-07 14:41:20 +02:00
parent 93104e5c59 78a24ffc03
commit 5eb6a81b60
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@@ -23,7 +23,8 @@ PHP NEWS
- Curl:
. Fix cloning of CURLOPT_POSTFIELDS when using the clone operator instead
of the curl_copy_handle() function to clone a CurlHandle. (timwolla)
. Fix curl build failure on macOS+curl 8.16. (nielsdos)
. Fix curl build and test failures with version 8.16.
(nielsdos, ilutov, Jakub Zelenka)
- Date:
. Fixed GH-17159: "P" format for ::createFromFormat swallows string literals.

12
ext/curl/tests/curl_setopt_ssl.phpt
View File

@@ -18,9 +18,13 @@ if ($curl_version['version_number'] < 0x074700) {
--FILE--
<?php
function check_error(CurlHandle $ch) {
function check_error(CurlHandle $ch, $expected = null) {
if (curl_errno($ch) !== 0) {
echo "CURL ERROR: " . curl_errno($ch) . "\n";
$errno = curl_errno($ch);
if (!is_null($expected)) {
$errno = $errno == $expected ? 'EXPECTED' : "UNEXPECTED(A:$errno,E:$expected)";
}
echo "CURL ERROR: " . $errno . "\n";
}
}
@@ -109,7 +113,7 @@ try {
$response = curl_exec($ch);
check_response($response, $clientCertSubject);
check_error($ch);
check_error($ch, curl_version()['version_number'] < 0x081000 ? 58 : 43);
curl_close($ch);
echo "\n";
@@ -203,7 +207,7 @@ bool(true)
bool(true)
bool(true)
client cert subject not in response
CURL ERROR: 58
CURL ERROR: EXPECTED
case 4: client cert and key from file
bool(true)