Fix constructing application with non-configurable prototype properties

fixes #2561
expressjs · Mar 1, 2015 · 31cb541 · 31cb541
1 parent 7ee56bb
commit 31cb541
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/History.md b/History.md
@@ -1,8 +1,10 @@
 unreleased
 ==========
 
+  * Fix constructing application with non-configurable prototype properties
   * Fix `req.host` when using "trust proxy" hops count
   * Fix `req.protocol`/`req.secure` when using "trust proxy" hops count
+  * deps: merge-descriptors@1.0.0
 
 4.12.0 / 2015-02-23
 ===================

diff --git a/lib/express.js b/lib/express.js
@@ -28,8 +28,8 @@ function createApplication() {
     app.handle(req, res, next);
   };
 
-  mixin(app, proto);
-  mixin(app, EventEmitter.prototype);
+  mixin(app, EventEmitter.prototype, false);
+  mixin(app, proto, false);
 
   app.request = { __proto__: req, app: app };
   app.response = { __proto__: res, app: app };

diff --git a/package.json b/package.json
@@ -37,6 +37,7 @@
     "etag": "~1.5.1",
     "finalhandler": "0.3.3",
     "fresh": "0.2.4",
+    "merge-descriptors": "1.0.0",
     "methods": "~1.1.1",
     "on-finished": "~2.2.0",
     "parseurl": "~1.3.0",
@@ -49,7 +50,6 @@
     "type-is": "~1.6.0",
     "vary": "~1.0.0",
     "cookie": "0.1.2",
-    "merge-descriptors": "0.0.2",
     "utils-merge": "1.0.0"
   },
   "devDependencies": {