Merge branch 'master' of github.com:mikeal/request

request · Mar 15, 2013 · 7d10c1e · 7d10c1e
2 parents 16b5ab9 + aa208cf
commit 7d10c1e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -963,15 +963,21 @@ Request.prototype.multipart = function (multipart) {
   return self
 }
 Request.prototype.json = function (val) {
-  this.setHeader('accept', 'application/json')
+  var self = this;
+  var setAcceptHeader = function() {
+  	if (!self.headers['accept'] && !self.headers['Accept']) {
+			  self.setHeader('accept', 'application/json')
+		}
+	}
+  setAcceptHeader();
   this._json = true
   if (typeof val === 'boolean') {
     if (typeof this.body === 'object') {
-      this.setHeader('content-type', 'application/json')
+      setAcceptHeader();
       this.body = safeStringify(this.body)
     }
   } else {
-    this.setHeader('content-type', 'application/json')
+    setAcceptHeader();
     this.body = safeStringify(val)
   }
   return this

diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "url": "http://github.com/mikeal/request/issues"
   },
   "engines": [
-    "node >= 0.3.6"
+    "node >= 0.8.0"
   ],
   "main": "index.js",
   "dependencies": {