move the patch to the response proto

higgspa · Mar 6, 2014 · 3112f92 · 3112f92
1 parent 74f55a8
commit 3112f92
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 45 deletions.
diff --git a/lib/express.js b/lib/express.js
@@ -13,9 +13,6 @@ var proto = require('./application')
   , req = require('./request')
   , res = require('./response')
 
-// monkey patch ServerResponse methods
-require('./patch')
-
 /**
  * Expose `createApplication()`.
  */

diff --git a/lib/patch.js b/lib/patch.js
diff --git a/lib/response.js b/lib/response.js
@@ -16,7 +16,9 @@ var http = require('http')
   , resolve = require('url').resolve
   , basename = path.basename
   , extname = path.extname
-  , mime = send.mime
+  , mime = send.mime;
+var ServerResponse = http.ServerResponse;
+var setHeader = ServerResponse.prototype.setHeader;
 
 /**
  * Response prototype.
@@ -779,3 +781,23 @@ res.render = function(view, options, fn){
   // render
   app.render(view, options, fn);
 };
+
+
+/**
+ * Set header `field` to `val`, special-casing
+ * the `Set-Cookie` field for multiple support.
+ *
+ * @param {String} field
+ * @param {String} val
+ * @api public
+ */
+
+res.setHeader = function(field, val){
+  var key = field.toLowerCase();
+
+  if ('content-type' == key && this.charset) {
+    val += '; charset=' + this.charset;
+  }
+
+  return setHeader.call(this, field, val);
+};