From 5a9393d5da5b50232fdf055c5d335e6b0ce252cc Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sat, 16 Mar 2013 09:46:35 +0100 Subject: [PATCH 1/7] Update version checks --- bin/installDeps.sh | 4 ++-- bin/installOnWindows.bat | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/installDeps.sh b/bin/installDeps.sh index 9763f41ba..2f97090b7 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -44,8 +44,8 @@ fi #check node version NODE_VERSION=$(node --version) NODE_V_MINOR=$(echo $NODE_VERSION | cut -d "." -f 1-2) -if [ ! $NODE_V_MINOR = "v0.8" ] && [ ! $NODE_V_MINOR = "v0.6" ]; then - echo "You're running a wrong version of node, you're using $NODE_VERSION, we need v0.6.x or v0.8.x" >&2 +if [ ! $NODE_V_MINOR = "v0.8" ] && [ ! $NODE_V_MINOR = "v0.6" && [ ! $NODE_V_MINOR = "v0.10" ]; then + echo "You're running a wrong version of node, you're using $NODE_VERSION, we need v0.6.x, v0.8.x or v0.10.x" >&2 exit 1 fi diff --git a/bin/installOnWindows.bat b/bin/installOnWindows.bat index f678672b1..f74529829 100644 --- a/bin/installOnWindows.bat +++ b/bin/installOnWindows.bat @@ -8,7 +8,7 @@ cmd /C node -e "" || ( echo "Please install node.js ( http://nodejs.org )" && ex echo _ echo Checking node version... -set check_version="if(['6','8'].indexOf(process.version.split('.')[1].toString()) === -1) { console.log('You are running a wrong version of Node. Etherpad Lite requires v0.6.x or v0.8.x'); process.exit(1) }" +set check_version="if(['6','8','10'].indexOf(process.version.split('.')[1].toString()) === -1) { console.log('You are running a wrong version of Node. Etherpad Lite requires v0.6.x, v0.8.x or v0.10.x'); process.exit(1) }" cmd /C node -e %check_version% || exit /B 1 echo _ From cd9c78998e84568d85bb850d892adee5ea5710b6 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sat, 16 Mar 2013 09:47:10 +0100 Subject: [PATCH 2/7] Fix path.join in Settings.js --- src/node/utils/Settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/utils/Settings.js b/src/node/utils/Settings.js index 45f81aa5f..901ac5146 100644 --- a/src/node/utils/Settings.js +++ b/src/node/utils/Settings.js @@ -142,7 +142,7 @@ exports.abiwordAvailable = function() exports.reloadSettings = function reloadSettings() { // Discover where the settings file lives var settingsFilename = argv.settings || "settings.json"; - settingsFilename = path.resolve(path.join(root, settingsFilename)); + settingsFilename = path.resolve(path.join(exports.root, settingsFilename)); var settingsStr; try{ From e050ad57e48916ca72a9378a5c4c641b45ec7f06 Mon Sep 17 00:00:00 2001 From: John McLear Date: Fri, 22 Mar 2013 17:39:22 +0000 Subject: [PATCH 3/7] fix typo --- bin/installDeps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/installDeps.sh b/bin/installDeps.sh index 2f97090b7..fc3133c16 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -44,7 +44,7 @@ fi #check node version NODE_VERSION=$(node --version) NODE_V_MINOR=$(echo $NODE_VERSION | cut -d "." -f 1-2) -if [ ! $NODE_V_MINOR = "v0.8" ] && [ ! $NODE_V_MINOR = "v0.6" && [ ! $NODE_V_MINOR = "v0.10" ]; then +if [ ! $NODE_V_MINOR = "v0.8" ] && [ ! $NODE_V_MINOR = "v0.6" ] && [ ! $NODE_V_MINOR = "v0.10" ]; then echo "You're running a wrong version of node, you're using $NODE_VERSION, we need v0.6.x, v0.8.x or v0.10.x" >&2 exit 1 fi From b3988e30d54ceccbf16a2586701e490fd037980c Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 23 Mar 2013 17:55:34 +0000 Subject: [PATCH 4/7] pump isdeprecated --- src/node/utils/caching_middleware.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/utils/caching_middleware.js b/src/node/utils/caching_middleware.js index c6b237139..a970bfc95 100644 --- a/src/node/utils/caching_middleware.js +++ b/src/node/utils/caching_middleware.js @@ -168,7 +168,7 @@ CachingMiddleware.prototype = new function () { } else if (req.method == 'GET') { var readStream = fs.createReadStream(pathStr); res.writeHead(statusCode, headers); - util.pump(readStream, res); + readableStream.pipe(readStream, res); } else { res.writeHead(statusCode, headers); res.end(); From d515acae96dd9a74fb398412cc93d22a18329ade Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 23 Mar 2013 18:01:44 +0000 Subject: [PATCH 5/7] expires was never defined --- src/node/db/SessionStore.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/db/SessionStore.js b/src/node/db/SessionStore.js index 09ea73330..52a504f10 100644 --- a/src/node/db/SessionStore.js +++ b/src/node/db/SessionStore.js @@ -22,7 +22,7 @@ SessionStore.prototype.get = function(sid, fn){ { if (sess) { sess.cookie.expires = 'string' == typeof sess.cookie.expires ? new Date(sess.cookie.expires) : sess.cookie.expires; - if (!sess.cookie.expires || new Date() < expires) { + if (!sess.cookie.expires || new Date() < sess.cookie.expires) { fn(null, sess); } else { self.destroy(sid, fn); From 358b07390e28338ddf6fa6e077fdbeb117431c99 Mon Sep 17 00:00:00 2001 From: Manuel Knitza Date: Sat, 30 Mar 2013 15:42:10 +0100 Subject: [PATCH 6/7] fix "util.pump() is deprecated. Use readableStream.pipe()" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix error introduced by b3988e3  --- src/node/utils/caching_middleware.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/node/utils/caching_middleware.js b/src/node/utils/caching_middleware.js index a970bfc95..ab3d8edde 100644 --- a/src/node/utils/caching_middleware.js +++ b/src/node/utils/caching_middleware.js @@ -168,7 +168,7 @@ CachingMiddleware.prototype = new function () { } else if (req.method == 'GET') { var readStream = fs.createReadStream(pathStr); res.writeHead(statusCode, headers); - readableStream.pipe(readStream, res); + readStream.pipe(res); } else { res.writeHead(statusCode, headers); res.end(); From 98f00e293c66ff03e980dbb3b1767199f535df63 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Mon, 1 Apr 2013 13:24:22 +0200 Subject: [PATCH 7/7] Update ueberDB to add support for node 0.10.x --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index a7147cf2a..7d30cc49b 100644 --- a/src/package.json +++ b/src/package.json @@ -16,7 +16,7 @@ "require-kernel" : "1.0.5", "resolve" : "0.2.x", "socket.io" : "0.9.x", - "ueberDB" : "0.1.94", + "ueberDB" : "0.2.x", "async" : "0.1.x", "express" : "3.x", "connect" : "2.4.x",