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

5 years ago · f5de72dcb2
parent 15d86c9bd1 90518224fe
commit f5de72dcb2
1 changed files with 3 additions and 1 deletions
--- a/server.js
+++ b/server.js
@ -43,7 +43,9 @@ if (process.env.PACKAGE) {
    }

    config.httpUnsafeOrigin = config.httpUnsafeOrigin.trim();
+    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