Skip to content

Commit

Permalink
Merge branch '5.3' into 5.4
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
nicolas-grekas committed Dec 25, 2021
2 parents d6c0e0e + 6783f79 commit 0ea5f17
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
10 changes: 8 additions & 2 deletions CurlHttpClient.php
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,6 @@ private function validateExtraCurlOptions(array $options): void
\CURLOPT_INFILESIZE => 'body',
\CURLOPT_POSTFIELDS => 'body',
\CURLOPT_UPLOAD => 'body',
\CURLOPT_PINNEDPUBLICKEY => 'peer_fingerprint',
\CURLOPT_UNIX_SOCKET_PATH => 'bindto',
\CURLOPT_INTERFACE => 'bindto',
\CURLOPT_TIMEOUT_MS => 'max_duration',
\CURLOPT_TIMEOUT => 'max_duration',
Expand All @@ -463,6 +461,14 @@ private function validateExtraCurlOptions(array $options): void
\CURLOPT_PROGRESSFUNCTION => 'on_progress',
];

if (\defined('CURLOPT_UNIX_SOCKET_PATH')) {
$curloptsToConfig[\CURLOPT_UNIX_SOCKET_PATH] = 'bindto';
}

if (\defined('CURLOPT_PINNEDPUBLICKEY')) {
$curloptsToConfig[\CURLOPT_PINNEDPUBLICKEY] = 'peer_fingerprint';
}

$curloptsToCheck = [
\CURLOPT_PRIVATE,
\CURLOPT_HEADERFUNCTION,
Expand Down
3 changes: 3 additions & 0 deletions Tests/HttpClientTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ abstract class HttpClientTestCase extends BaseHttpClientTestCase
{
private static $vulcainStarted = false;

/**
* @group transient-on-macos
*/
public function testTimeoutOnDestruct()
{
if (!method_exists(parent::class, 'testTimeoutOnDestruct')) {
Expand Down

0 comments on commit 0ea5f17

Please sign in to comment.