Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

This commit is contained in:
yflory 2020-04-06 16:27:12 +02:00
commit f5de72dcb2

View file

@ -43,7 +43,9 @@ if (process.env.PACKAGE) {
}
config.httpUnsafeOrigin = config.httpUnsafeOrigin.trim();
config.httpSafeOrigin = config.httpSafeOrigin.trim().replace(/\/$/, '');
if (typeof(config.httpSafeOrigin) === 'string') {
config.httpSafeOrigin = config.httpSafeOrigin.trim().replace(/\/$/, '');
}
// fall back to listening on a local address
// if httpAddress is not a string