merge: 10.6 updates

2025-01-21 13:34:19 +00:00
parent 192635f2ce 8d3db909d9
commit c4c47bdc27
25 changed files with 466 additions and 79 deletions
--- a/api/src/stream/stream.js
+++ b/api/src/stream/stream.js
@@ -10,7 +10,7 @@ export default async function(res, streamInfo) {
                return await stream.proxy(streamInfo, res);

            case "internal":
-                return await internalStream(streamInfo, res);
+                return await internalStream(streamInfo.data, res);

            case "merge":
                return await stream.merge(streamInfo, res);