infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'soon' into staging

pull/1/head
ansuz 2020-03-11 16:52:09 -04:00
parent 77894b5336 e80a81a2bb
commit 9cb92d2e6f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/storage/tasks.js
View File

@ -102,6 +102,7 @@ var list = Tasks.list = function (env, cb, migration) {
root: env.root, root: env.root,
error: e, error: e,
}); });
w.abort();
return void cb(e); return void cb(e);
} }
if (list.length === 0) { if (list.length === 0) {

2
server.js
View File

@ -55,7 +55,7 @@ if (process.env.PACKAGE) {
config.httpPort = 3000; config.httpPort = 3000;
} }
if (typeof(httpSafeOrigin) !== 'string') { if (typeof(config.httpSafeOrigin) !== 'string') {
if (typeof(config.httpSafePort) !== 'number') { if (typeof(config.httpSafePort) !== 'number') {
config.httpSafePort = config.httpPort + 1; config.httpSafePort = config.httpPort + 1;
} }