diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2025-05-18 19:53:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-18 19:53:17 +0200 |
| commit | 0e20d9e736a0891f19e6f5bd9730171bb0f29c31 (patch) | |
| tree | b7cd26ef2f1451877ef4cd4d1cf9dc609551558e | |
| parent | b9983cbd42366811ea6a149d10ccea3d0656405f (diff) | |
| parent | 2dcadd2603da71e995e2fd1cec183772e6932521 (diff) | |
| download | nextcloud-server-0e20d9e736a0891f19e6f5bd9730171bb0f29c31.tar.gz nextcloud-server-0e20d9e736a0891f19e6f5bd9730171bb0f29c31.zip | |
Merge pull request #52937 from nextcloud/fix/s3-versions³
fix(files_versions): only close stream if still open, fixing S3
| -rw-r--r-- | apps/files_versions/lib/Storage.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php index 4b58d721583..0fb3a0522f4 100644 --- a/apps/files_versions/lib/Storage.php +++ b/apps/files_versions/lib/Storage.php @@ -430,11 +430,17 @@ class Storage { } else { $target = $storage2->fopen($internalPath2, 'w'); $result = $target !== false; - if ($target !== false) { + if ($result) { [, $result] = Files::streamCopy($source, $target, true); + } + // explicit check as S3 library closes streams already + if (is_resource($target)) { fclose($target); } } + } + // explicit check as S3 library closes streams already + if (is_resource($source)) { fclose($source); } |