Invalid redirect in pipe

.gitignore

@@ -15,3 +15,4 @@ coverage
 .nyc_output
 lib
 dist
+*.swp

src/node/index.js

@@ -423,9 +423,13 @@ Request.prototype.pipe = function(stream, options) {
 Request.prototype._pipeContinue = function(stream, options) {
   this.req.once('response', res => {
     // redirect
-    const redirect = isRedirect(res.statusCode);
-    if (redirect && this._redirects++ !== this._maxRedirects) {
-      return this._redirect(res)._pipeContinue(stream, options);
+    if (
+      isRedirect(res.statusCode) &&
+      this._redirects++ !== this._maxRedirects
+    ) {
+      return this._redirect(res) === this
+        ? this._pipeContinue(stream, options)
+        : undefined;
     }
 
     this.res = res;

test/node/pipe.js

@@ -17,6 +17,14 @@ app.get('/', (req, res) => {
   fs.createReadStream('test/node/fixtures/user.json').pipe(res);
 });
 
+app.get('/redirect', (req, res) => {
+  res.set('Location', '/').sendStatus(302);
+});
+
+app.get('/badRedirectNoLocation', (req, res) => {
+  res.set('Location', '').sendStatus(302);
+});
+
 app.post('/', (req, res) => {
   if (process.env.HTTP2_TEST) {
     // body-parser does not support http2 yet.
@@ -93,4 +101,49 @@ describe('request pipe', () => {
     });
     req.pipe(stream);
   });
+
+  it('should follow redirects', done => {
+    const stream = fs.createWriteStream(destPath);
+
+    let responseCalled = false;
+    const req = request.get(base + '/redirect');
+    req.type('json');
+
+    req.on('response', res => {
+      res.status.should.eql(200);
+      responseCalled = true;
+    });
+    stream.on('finish', () => {
+      JSON.parse(fs.readFileSync(destPath, 'utf8')).should.eql({
+        name: 'tobi'
+      });
+      responseCalled.should.be.true();
+      done();
+    });
+    req.pipe(stream);
+  });
+
+  it('should not throw on bad redirects', done => {
+    const stream = fs.createWriteStream(destPath);
+
+    let responseCalled = false;
+    let errorCalled = false;
+    const req = request.get(base + '/badRedirectNoLocation');
+    req.type('json');
+
+    req.on('response', res => {
+      responseCalled = true;
+    });
+    req.on('error', err => {
+      err.message.should.eql('No location header for redirect');
+      errorCalled = true;
+      stream.end();
+    });
+    stream.on('finish', () => {
+      responseCalled.should.be.false();
+      errorCalled.should.be.true();
+      done();
+    });
+    req.pipe(stream);
+  });
 });