Skip to content

Commit 5962356

Browse files
Merge branch '6.4' into 7.1
* 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
2 parents 274e2f6 + 224124d commit 5962356

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

DataCollector/HttpClientDataCollector.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ private function escapePayload(string $payload): string
252252
{
253253
static $useProcess;
254254

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

259259
if ('\\' === \DIRECTORY_SEPARATOR) {

0 commit comments

Comments
 (0)