Fixing config weirdness

lib/adapters/http.js

@@ -1,6 +1,5 @@
 'use strict';
 
-var defaults = require('./../defaults');
 var utils = require('./../utils');
 var buildURL = require('./../helpers/buildURL');
 var transformData = require('./../helpers/transformData');
@@ -12,19 +11,8 @@ var pkg = require('./../../package.json');
 var Buffer = require('buffer').Buffer;
 
 module.exports = function httpAdapter(resolve, reject, config) {
-  // Transform request data
-  var data = transformData(
-    config.data,
-    config.headers,
-    config.transformRequest
-  );
-
-  // Merge headers
-  var headers = utils.merge(
-    defaults.headers.common,
-    defaults.headers[config.method] || {},
-    config.headers || {}
-  );
+  var data = config.data;
+  var headers = config.headers;
 
   // Set User-Agent (required by some servers)
   // Only set header if it hasn't been set in config

lib/adapters/xhr.js

@@ -2,7 +2,6 @@
 
 /*global ActiveXObject:true*/
 
-var defaults = require('./../defaults');
 var utils = require('./../utils');
 var buildURL = require('./../helpers/buildURL');
 var parseHeaders = require('./../helpers/parseHeaders');
@@ -12,21 +11,10 @@ var ieVersion = require('./../helpers/ieVersion');
 var btoa = window.btoa || require('./../helpers/btoa');
 
 module.exports = function xhrAdapter(resolve, reject, config) {
-  // Transform request data
-  var data = transformData(
-    config.data,
-    config.headers,
-    config.transformRequest
-  );
+  var requestData = config.data;
+  var requestHeaders = config.headers;
 
-  // Merge headers
-  var requestHeaders = utils.merge(
-    defaults.headers.common,
-    defaults.headers[config.method] || {},
-    config.headers || {}
-  );
-
-  if (utils.isFormData(data)) {
+  if (utils.isFormData(requestData)) {
     delete requestHeaders['Content-Type']; // Let the browser set it
   }
 
@@ -89,19 +77,19 @@ module.exports = function xhrAdapter(resolve, reject, config) {
     var cookies = require('./../helpers/cookies');
 
     // Add xsrf header
-    var xsrfValue =  config.withCredentials || isURLSameOrigin(config.url) ?
-        cookies.read(config.xsrfCookieName || defaults.xsrfCookieName) :
+    var xsrfValue = config.withCredentials || isURLSameOrigin(config.url) ?
+        cookies.read(config.xsrfCookieName) :
         undefined;
 
     if (xsrfValue) {
-      requestHeaders[config.xsrfHeaderName || defaults.xsrfHeaderName] = xsrfValue;
+      requestHeaders[config.xsrfHeaderName] = xsrfValue;
     }
   }
 
   // Add headers to the request
   if (!xDomain) {
     utils.forEach(requestHeaders, function setRequestHeader(val, key) {
-      if (!data && key.toLowerCase() === 'content-type') {
+      if (!requestData && key.toLowerCase() === 'content-type') {
         // Remove Content-Type if data is undefined
         delete requestHeaders[key];
       } else {
@@ -127,10 +115,10 @@ module.exports = function xhrAdapter(resolve, reject, config) {
     }
   }
 
-  if (utils.isArrayBuffer(data)) {
-    data = new DataView(data);
+  if (utils.isArrayBuffer(requestData)) {
+    requestData = new DataView(requestData);
   }
 
   // Send the request
-  request.send(data);
+  request.send(requestData);
 };