Merge branch 'develop'

master
Stefan Otto 2018-06-29 13:10:20 +02:00
commit 8fdd1d1ab1
2 changed files with 13 additions and 13 deletions

View File

@ -13,9 +13,7 @@ function homer(server)
server.on('newroom', (room) =>
{
const fileName =
path.join(
process.env.MEDIASOUP_HOMER_OUTPUT,
`${(new Date()).toISOString()}_${room.id}`);
path.join(process.env.MEDIASOUP_HOMER_OUTPUT);
const stream = fs.createWriteStream(fileName, { flags: 'a' });

View File

@ -158,6 +158,7 @@ const actions = {
var resolvedBase = path.resolve('./public');
var safeSuffix = path.normalize(req.url).replace(/^(\.\.[\/\\])+/, '');
var fileLoc = path.join(resolvedBase, safeSuffix);
var headers = {};
var stream = fs.createReadStream(fileLoc);
@ -169,7 +170,8 @@ const actions = {
});
// File exists, stream it to user
res.statusCode = 200;
if (parsedUrl.pathname.indexOf('svg') === parsedUrl.pathname.length -3) {headers = {'Content-Type': 'image/svg+xml'}};
res.writeHead(200, headers);
stream.pipe(res);
}
},