node 0.11 fixes

hapijs · Aug 28, 2013 · 4400330 · 4400330
1 parent bd3a9cc
commit 4400330
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/lib/payload.js b/lib/payload.js
@@ -62,11 +62,12 @@ exports.read = function (request, next) {
     var clientTimeoutId = null;
 
     if (clientTimeout) {
-        clientTimeout -= Date.now() - request._timestamp;
+        clientTimeout -= (Date.now() - request._timestamp);
+
         clientTimeoutId = setTimeout(function () {
 
             finish(Boom.clientTimeout('Client is taking too long to send request'));
-        }, clientTimeout);
+        }, clientTimeout < 0 ? 0 : clientTimeout);
     }
 
     // Return only once from events

diff --git a/lib/response/stream.js b/lib/response/stream.js
@@ -173,10 +173,6 @@ internals.Stream.prototype._transmit = function (request, callback) {
             });
 
             self._preview.end();
-
-            if (self._stream.destroy) {
-                self._stream.destroy();
-            }
         }
     };
 

diff --git a/test/integration/clientTimeout.js b/test/integration/clientTimeout.js
@@ -82,19 +82,17 @@ describe('Client Timeout', function () {
                 method: 'POST'
             };
 
-
             var req = Http.request(options, function (res) {
 
                 expect(res.statusCode).to.equal(408);
                 expect(timer.elapsed()).to.be.at.least(49);
                 done();
             });
 
-            req.on('error', function (err) {                    // Will error out, so don't allow error to escape test
-
-            });
+            req.on('error', function (err) { });                    // Will error out, so don't allow error to escape test
 
-            req.write('\n');
+            req.write('{}\n');
+            var now = Date.now();
             setTimeout(function () {
 
                 req.end();