Merge pull request hapijs#903 from wpreul/master

Fixing issue where timeout occurs after socket close in client
jmonster · May 30, 2013 · 3ae657e · 3ae657e
2 parents 606b6ce + c15deee
commit 3ae657e
Show file tree

Hide file tree

Showing 2 changed files with 58 additions and 2 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -47,8 +47,6 @@ exports.request = function (method, url, options, callback, _trace) {
         if (!isFinished) {
             isFinished = true;
 
-            req.removeAllListeners();
-
             return callback(err, res);
         }
     };

diff --git a/test/unit/client.js b/test/unit/client.js
@@ -126,5 +126,63 @@ describe('Client', function () {
                 done();
             });
         });
+
+        it('handles a timeout during a socket close', function (done) {
+
+            var server = Http.createServer(function (req, res) {
+
+                req.once('error', function () { });
+                res.once('error', function () { });
+
+                setTimeout(function () {
+
+                    req.destroy();
+                }, 5);
+            });
+
+            server.once('error', function () { });
+
+            server.once('listening', function () {
+
+                Client.request('get', 'http://127.0.0.1:' + server.address().port, { payload: '', timeout: 5 }, function (err) {
+
+                    expect(err).to.exist;
+                    server.close();
+
+                    setTimeout(done, 5);
+                });
+            });
+
+            server.listen(0);
+        });
+
+        it('handles an error after a timeout', function (done) {
+
+            var server = Http.createServer(function (req, res) {
+
+                req.once('error', function () { });
+                res.once('error', function () { });
+
+                setTimeout(function () {
+
+                    res.socket.write('ERROR');
+                }, 5);
+            });
+
+            server.once('error', function () { });
+
+            server.once('listening', function () {
+
+                Client.request('get', 'http://127.0.0.1:' + server.address().port, { payload: '', timeout: 5 }, function (err) {
+
+                    expect(err).to.exist;
+                    server.close();
+
+                    setTimeout(done, 5);
+                });
+            });
+
+            server.listen(0);
+        });
     });
 });