Skip to content

Commit 07edb22

Browse files
leftybournesbackportbot[bot]
authored andcommitted
fix(s3): trim multiple spaces to single space in original path header
Signed-off-by: Kent Delante <kent@delante.me> The spec defines that x-amz-meta-original-path header needs spaces to be trimmed and multiple spaces need to be converted to a single space. This is to comply with the spec and fix it for some storage hosts that return a SignatureDoesNotMatch error when not done.
1 parent 5500dc1 commit 07edb22

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

lib/private/Files/ObjectStore/ObjectStoreStorage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ public function writeStream(string $path, $stream, ?int $size = null): int {
478478
$metadata = [
479479
'mimetype' => $mimetype,
480480
'original-storage' => $this->getId(),
481-
'original-path' => $path,
481+
'original-path' => preg_replace('/\s+/', ' ', $path) ?? $path,
482482
];
483483
if ($size) {
484484
$metadata['size'] = $size;

0 commit comments

Comments
 (0)