Merge pull request ether#2 from mfojtik/bugzilla/1079854

Bug 1079854 - Update etherpad for compatibility issues with old express ...
nhahn · Apr 1, 2014 · a0c5b94 · a0c5b94
2 parents e8b4a93 + 6f092f8
commit a0c5b94
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/node/server.js b/node/server.js
@@ -77,7 +77,7 @@ async.waterfall([
  function (callback)
  {
  //create server
- var app = express.createServer();
+ var app = express();
 
  app.use(function (req, res, next) {
  res.header("Server", serverName);
@@ -135,7 +135,7 @@ async.waterfall([
  app.use(express.cookieParser());
  });
 
- app.error(function(err, req, res, next){
+ app.use(function(err, req, res, next) {
  res.send(500);
  console.error(err.stack ? err.stack : err.toString());
  gracefulShutdown();

diff --git a/package.json b/package.json
@@ -14,7 +14,7 @@
  "socket.io" : "0.8.7",
  "ueberDB" : "0.1.7",
  "async" : "0.1.15",
- "express" : "2.5.0",
+ "express" : "3.1.0",
  "clean-css" : "0.3.2",
  "uglify-js" : "1.2.5",
  "formidable" : "1.0.7",