Resolving merge conflicts

lib/adapters/http.js

@@ -9,6 +9,7 @@ var url = require('url');
 var zlib = require('zlib');
 var pkg = require('./../../package.json');
 var Buffer = require('buffer').Buffer;
+var settle = require('../helpers/settle');
 
 /*eslint consistent-return:0*/
 module.exports = function httpAdapter(resolve, reject, config) {
@@ -24,13 +25,13 @@ module.exports = function httpAdapter(resolve, reject, config) {
     headers['User-Agent'] = 'axios/' + pkg.version;
   }
 
-  if (data) {
+  if (data && !utils.isStream(data)) {
     if (utils.isArrayBuffer(data)) {
       data = new Buffer(new Uint8Array(data));
     } else if (utils.isString(data)) {
       data = new Buffer(data, 'utf-8');
     } else {
-      return reject(new Error('Data after transformation must be a string or an ArrayBuffer'));
+      return reject(new Error('Data after transformation must be a string, an ArrayBuffer, or a Stream'));
     }
 
     // Add Content-Length header if data exists
@@ -93,44 +94,42 @@ module.exports = function httpAdapter(resolve, reject, config) {
       break;
     }
 
-    var responseBuffer = [];
-    stream.on('data', function handleStreamData(chunk) {
-      responseBuffer.push(chunk);
+    var response = {
+      status: res.statusCode,
+      statusText: res.statusMessage,
+      headers: res.headers,
+      config: config,
+      request: req
+    };
 
-      // make sure the content length is not over the maxContentLength if specified
-      if (config.maxContentLength > -1 && Buffer.concat(responseBuffer).length > config.maxContentLength) {
-        reject(new Error('maxContentLength size of ' + config.maxContentLength + ' exceeded'));
-      }
-    });
+    if (config.responseType === 'stream') {
+      response.data = stream;
+      settle(resolve, reject, response);
+    } else {
+      var responseBuffer = [];
+      stream.on('data', function handleStreamData(chunk) {
+        responseBuffer.push(chunk);
 
-    stream.on('error', function handleStreamError(err) {
-      if (aborted) return;
-      reject(err);
-    });
+        // make sure the content length is not over the maxContentLength if specified
+        if (config.maxContentLength > -1 && Buffer.concat(responseBuffer).length > config.maxContentLength) {
+          reject(new Error('maxContentLength size of ' + config.maxContentLength + ' exceeded'));
+        }
+      });
 
-    stream.on('end', function handleStreamEnd() {
-      var d = Buffer.concat(responseBuffer);
-      if (config.responseType !== 'arraybuffer') {
-        d = d.toString('utf8');
-      }
-      var response = {
-        data: transformData(
-          d,
-          res.headers,
-          config.transformResponse
-        ),
-        status: res.statusCode,
-        statusText: res.statusMessage,
-        headers: res.headers,
-        config: config,
-        request: req
-      };
+      stream.on('error', function handleStreamError(err) {
+        if (aborted) return;
+        reject(err);
+      });
 
-      // Resolve or reject the Promise based on the status
-      (res.statusCode >= 200 && res.statusCode < 300 ?
-        resolve :
-        reject)(response);
-    });
+      stream.on('end', function handleStreamEnd() {
+        var responseData = Buffer.concat(responseBuffer);
+        if (config.responseType !== 'arraybuffer') {
+          responseData = responseData.toString('utf8');
+        }
+        response.data = transformData(responseData, res.headers, config.transformResponse);
+        settle(resolve, reject, response);
+      });
+    }
   });
 
   // Handle errors
@@ -152,5 +151,9 @@ module.exports = function httpAdapter(resolve, reject, config) {
   }
 
   // Send the request
-  req.end(data);
+  if (utils.isStream(data)) {
+    data.pipe(req);
+  } else {
+    req.end(data);
+  }
 };

lib/adapters/xhr.js

@@ -6,6 +6,7 @@ var parseHeaders = require('./../helpers/parseHeaders');
 var transformData = require('./../helpers/transformData');
 var isURLSameOrigin = require('./../helpers/isURLSameOrigin');
 var btoa = (typeof window !== 'undefined' && window.btoa) || require('./../helpers/btoa');
+var settle = require('../helpers/settle');
 
 module.exports = function xhrAdapter(resolve, reject, config) {
   var requestData = config.data;
@@ -26,6 +27,8 @@ module.exports = function xhrAdapter(resolve, reject, config) {
     request = new window.XDomainRequest();
     loadEvent = 'onload';
     xDomain = true;
+    request.onprogress = function handleProgress() {};
+    request.ontimeout = function handleTimeout() {};
   }
 
   // HTTP basic authentication
@@ -40,10 +43,6 @@ module.exports = function xhrAdapter(resolve, reject, config) {
   // Set the request timeout in MS
   request.timeout = config.timeout;
 
-  // For IE 9 CORS support.
-  request.onprogress = function handleProgress() {};
-  request.ontimeout = function handleTimeout() {};
-
   // Listen for ready state
   request[loadEvent] = function handleLoad() {
     if (!request || (request.readyState !== 4 && !xDomain)) {
@@ -73,11 +72,7 @@ module.exports = function xhrAdapter(resolve, reject, config) {
       request: request
     };
 
-    // Resolve or reject the Promise based on the status
-    ((response.status >= 200 && response.status < 300) ||
-     (!('status' in request) && request.responseText) ?
-      resolve :
-      reject)(response);
+    settle(resolve, reject, response);
 
     // Clean up request
     request = null;
@@ -158,11 +153,6 @@ module.exports = function xhrAdapter(resolve, reject, config) {
     }
   }
 
-  // Format request data
-  if (utils.isArrayBuffer(requestData)) {
-    requestData = new DataView(requestData);
-  }
-
   if (requestData === undefined) {
     requestData = null;
   }