Merge pull request #3472 from kanongil/close-on-payload

Send connection close when there is unconsumed payload

lib/request.js

@@ -133,7 +133,7 @@ internals.Request = function (connection, req, res, options) {
     this._logger = [];
     this._allowInternals = !!options.allowInternals;
     this._expectContinue = !!options.expectContinue;
-    this._isPayloadPending = true;      // false when incoming payload fully processed
+    this._isPayloadPending = !!(req.headers['content-length'] || req.headers['transfer-encoding']);      // false when incoming payload fully processed
     this._isBailed = false;             // true when lifecycle should end
     this._isReplied = false;            // true when response processing started
     this._isFinalized = false;          // true when request completed (may be waiting on tails to complete)

lib/route.js

@@ -428,7 +428,7 @@ internals.payload = function (request, next) {
         if (!err ||
             !request._isPayloadPending) {
 
-            request._isPayloadPending = false;
+            request._isPayloadPending = !!(err || (parsed.payload && parsed.payload._readableState));
             return onParsed(err, parsed);
         }
 

lib/transmit.js

@@ -223,7 +223,9 @@ internals.transmit = function (response, callback) {
     // Connection: close
 
     const isInjection = Shot.isInjection(request.raw.req);
-    if (!isInjection && !request.connection._started) {
+    if (!(isInjection || request.connection._started) ||
+        (request._isPayloadPending && !request.raw.req._readableState.ended)) {
+
         response._header('connection', 'close');
     }
 

test/payload.js

@@ -677,6 +677,28 @@ describe('payload', () => {
         });
     });
 
+    it('signals connection close when payload is unconsumed', (done) => {
+
+        const payload = new Buffer(10 * 1024 * 1024).toString();
+
+        const handler = function (request, reply) {
+
+            return reply('ok');
+        };
+
+        const server = new Hapi.Server();
+        server.connection();
+        server.route({ method: 'POST', path: '/', config: { handler, payload: { maxBytes: 11 * 1024 * 1024, output: 'stream', parse: false } } });
+
+        server.inject({ method: 'POST', url: '/', payload, headers: { 'content-type': 'application/octet-stream' } }, (res) => {
+
+            expect(res.statusCode).to.equal(200);
+            expect(res.headers).to.include({ connection: 'close' });
+            expect(res.result).to.equal('ok');
+            done();
+        });
+    });
+
     it('times out when client request taking too long', (done) => {
 
         const handler = function (request, reply) {