Merge pull request request#946 from aj0strow/merge-default-headers

defaults: merge headers

index.js

@@ -67,8 +67,16 @@ request.defaults = function (options, requester) {
   var def = function (method) {
     var d = function (uri, opts, callback) {
       var params = initParams(uri, opts, callback)
-      for (var i in options) {
-        if (params.options[i] === undefined) params.options[i] = options[i]
+      Object.keys(options).forEach(function (key) {
+        if (key !== 'headers' && params.options[key] === undefined) {
+          params.options[key] = options[key]
+        }
+      })
+      if (options.headers) {
+        var headers = {}
+        util._extend(headers, options.headers)
+        util._extend(headers, params.options.headers)
+        params.options.headers = headers
       }
       if(typeof requester === 'function') {
         if(method === request) {

tests/test-defaults.js

@@ -21,6 +21,23 @@ s.listen(s.port, function () {
     counter += 1;
   });
 
+  s.on('/merge-headers', function (req, resp) {
+    assert.equal(req.headers.foo, 'bar')
+    assert.equal(req.headers.merged, 'yes')
+    resp.writeHead(200)
+    resp.end()
+  });
+
+  request.defaults({
+    headers:{foo:"bar", merged:"no"}
+  })(s.url + '/merge-headers', {
+    headers:{merged:"yes"}
+  }, function (e, r, b){
+    if (e) throw e
+    assert.equal(r.statusCode, 200)
+    counter += 1
+  });
+
   s.on('/post', function (req, resp) {
     assert.equal(req.headers.foo, 'bar');
     assert.equal(req.headers['content-type'], null);