Skip to content

Commit

Permalink
Merge branch '6.4' into 7.1
Browse files Browse the repository at this point in the history
* 6.4:
  [HttpClient] Fix Process-based escaping in HttpClientDataCollector
  fix for HttpClientDataCollector fails if proc_open is disabled via php.ini . Closes #58700
  Bump Symfony version to 6.4.14
  Update VERSION for 6.4.13
  Update CHANGELOG for 6.4.13
  Bump Symfony version to 5.4.46
  Update VERSION for 5.4.45
  Update CONTRIBUTORS for 5.4.45
  Update CHANGELOG for 5.4.45
  • Loading branch information
nicolas-grekas committed Oct 30, 2024
2 parents 274e2f6 + 224124d commit 5962356
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions DataCollector/HttpClientDataCollector.php
Original file line number Diff line number Diff line change
Expand Up @@ -252,8 +252,8 @@ private function escapePayload(string $payload): string
{
static $useProcess;

if ($useProcess ??= class_exists(Process::class)) {
return (new Process([$payload]))->getCommandLine();
if ($useProcess ??= function_exists('proc_open') && class_exists(Process::class)) {
return substr((new Process(['', $payload]))->getCommandLine(), 3);
}

if ('\\' === \DIRECTORY_SEPARATOR) {
Expand Down

0 comments on commit 5962356

Please sign in to comment.