Merge branch 'master' of github.com:mzabriskie/axios

lib/adapters/http.js

@@ -7,6 +7,7 @@ var transformData = require('./../helpers/transformData');
 var http = require('follow-redirects').http;
 var https = require('follow-redirects').https;
 var url = require('url');
+var zlib = require('zlib');
 var pkg = require('./../../package.json');
 var Buffer = require('buffer').Buffer;
 
@@ -59,12 +60,27 @@ module.exports = function httpAdapter(resolve, reject, config) {
   // Create the request
   var transport = parsed.protocol === 'https:' ? https : http;
   var req = transport.request(options, function (res) {
+
+    // uncompress the response body transparently if required
+    var stream = res;
+    switch(res.headers['content-encoding']) {
+      case 'gzip':
+      case 'compress':
+      case 'deflate': {
+        // add the unzipper to the body stream processing pipeline
+        stream = stream.pipe(zlib.createUnzip());
+
+        // remove the content-encoding in order to not confuse downstream operations
+        delete res.headers['content-encoding'];
+      }
+    }
+
     var responseBuffer = [];
-    res.on('data', function (chunk) {
+    stream.on('data', function (chunk) {
       responseBuffer.push(chunk);
     });
 
-    res.on('end', function () {
+    stream.on('end', function () {
       var data = Buffer.concat(responseBuffer);
       if (config.responseType !== 'arraybuffer') {
         data = data.toString('utf8');

test/unit/adapters/http.js

@@ -1,5 +1,6 @@
 var axios = require('../../../index');
 var http = require('http');
+var zlib = require('zlib');
 var server;
 
 module.exports = {
@@ -27,6 +28,29 @@ module.exports = {
     });
   },
 
+  testTransparentGunzip: function (test) {
+    var data = {
+      firstName: 'Fred',
+      lastName: 'Flintstone',
+      emailAddr: 'fred@example.com'
+    };
+
+    zlib.gzip(JSON.stringify(data), function(err, zipped) {
+
+      server = http.createServer(function (req, res) {
+        res.setHeader('Content-Type', 'application/json;charset=utf-8');
+        res.setHeader('Content-Encoding', 'gzip');
+        res.end(zipped);
+      }).listen(4444, function () {
+        axios.get('http://localhost:4444/').then(function (res) {
+          test.deepEqual(res.data, data);
+          test.done();
+        });
+      });
+
+    });
+  },
+
   testUTF8: function (test) {
     var str = Array(100000).join('ж');