Skip to content

Commit 0ea5f17

Browse files
Merge branch '5.3' into 5.4
* 5.3: [HttpClient] mark test transient [Mime] Fix test [Translation] Fix TranslationPullCommand with ICU translations Allow package-versions-deprecated plugin Update security.lb.xlf [Notifier] Use correct factory for the msteams transport Fix SessionListener without session in request Remove direct dependency on composer/package-versions-deprecated Remove the unused dependency on composer/package-versions-deprecated [Security/Http] Fix cookie clearing on logout [HttpClient] fix checking for recent curl consts
2 parents d6c0e0e + 6783f79 commit 0ea5f17

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

CurlHttpClient.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -439,8 +439,6 @@ private function validateExtraCurlOptions(array $options): void
439439
\CURLOPT_INFILESIZE => 'body',
440440
\CURLOPT_POSTFIELDS => 'body',
441441
\CURLOPT_UPLOAD => 'body',
442-
\CURLOPT_PINNEDPUBLICKEY => 'peer_fingerprint',
443-
\CURLOPT_UNIX_SOCKET_PATH => 'bindto',
444442
\CURLOPT_INTERFACE => 'bindto',
445443
\CURLOPT_TIMEOUT_MS => 'max_duration',
446444
\CURLOPT_TIMEOUT => 'max_duration',
@@ -463,6 +461,14 @@ private function validateExtraCurlOptions(array $options): void
463461
\CURLOPT_PROGRESSFUNCTION => 'on_progress',
464462
];
465463

464+
if (\defined('CURLOPT_UNIX_SOCKET_PATH')) {
465+
$curloptsToConfig[\CURLOPT_UNIX_SOCKET_PATH] = 'bindto';
466+
}
467+
468+
if (\defined('CURLOPT_PINNEDPUBLICKEY')) {
469+
$curloptsToConfig[\CURLOPT_PINNEDPUBLICKEY] = 'peer_fingerprint';
470+
}
471+
466472
$curloptsToCheck = [
467473
\CURLOPT_PRIVATE,
468474
\CURLOPT_HEADERFUNCTION,

Tests/HttpClientTestCase.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ abstract class HttpClientTestCase extends BaseHttpClientTestCase
3232
{
3333
private static $vulcainStarted = false;
3434

35+
/**
36+
* @group transient-on-macos
37+
*/
3538
public function testTimeoutOnDestruct()
3639
{
3740
if (!method_exists(parent::class, 'testTimeoutOnDestruct')) {

0 commit comments

Comments
 (0)