From 10ba98c4f5ec4efe6272516de47f0ce128ef2902 Mon Sep 17 00:00:00 2001 From: Mario Date: Tue, 11 Oct 2022 18:41:34 +0000 Subject: Revert "update composer libs" This reverts commit 108a3efe0b6d37a7ed394a84c69b924ca727f17a. --- vendor/sabre/http/lib/functions.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'vendor/sabre/http/lib/functions.php') diff --git a/vendor/sabre/http/lib/functions.php b/vendor/sabre/http/lib/functions.php index d0477d943..97673da46 100644 --- a/vendor/sabre/http/lib/functions.php +++ b/vendor/sabre/http/lib/functions.php @@ -349,7 +349,7 @@ function parseMimeType(string $str): array // The quality parameter, if it appears, also marks the end of // the parameter list. Anything after the q= counts as an // 'accept extension' and could introduce new semantics in - // content-negotiation. + // content-negotation. if ('q' !== $partName) { $parameters[$partName] = $part; } else { @@ -404,9 +404,11 @@ function decodePath(string $path): string function decodePathSegment(string $path): string { $path = rawurldecode($path); + $encoding = mb_detect_encoding($path, ['UTF-8', 'ISO-8859-1']); - if (!mb_check_encoding($path, 'UTF-8') && mb_check_encoding($path, 'ISO-8859-1')) { - $path = mb_convert_encoding($path, 'UTF-8', 'ISO-8859-1'); + switch ($encoding) { + case 'ISO-8859-1': + $path = utf8_encode($path); } return $path; -- cgit v1.2.3