Fix protect error when handlers timeout with onPreResponse. Closes #1885

lib/handler.js

@@ -373,6 +373,10 @@ exports.invoke = function (request, event, callback) {
         return Hoek.nextTick(callback)();
     }
 
+    if (event === 'onPreResponse') {
+        request._protect.reset();
+    }
+
     request._protect.run('ext:' + event, callback, function (exit) {
 
         Items.serial(exts.nodes, function (ext, next) {

lib/protect.js

@@ -36,7 +36,7 @@ internals.Protect.prototype.run = function (at, next, enter) {          // enter
 
     var self = this;
 
-    Hoek.assert(!this._error, 'Invalid nested use of protect.run() during: ' + root._at + ' while trying: ' + at);
+    Hoek.assert(!this._error, 'Invalid nested use of protect.run() during: ' + this._at + ' while trying: ' + at);
 
     var finish = function (/* arguments */) {
 
@@ -55,3 +55,10 @@ internals.Protect.prototype.run = function (at, next, enter) {          // enter
 
     enter(finish);
 };
+
+
+internals.Protect.prototype.reset = function () {
+
+    this._error = null;
+    this._at = '';
+};

package.json

@@ -2,7 +2,7 @@
   "name": "hapi",
   "description": "HTTP Server framework",
   "homepage": "http://hapijs.com",
-  "version": "6.7.0",
+  "version": "6.7.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/hapijs/hapi"

test/server.js

@@ -1313,6 +1313,27 @@ describe('Server', function () {
             });
         });
 
+        it('handles server handler timeout with onPreResponse ext', function (done) {
+
+            var handler = function (request, reply) {
+
+                setTimeout(reply, 20);
+            };
+
+            var serverExt = new Hapi.Server({ timeout: { server: 10 } });
+            serverExt.route({ method: 'GET', path: '/', config: { handler: handler } });
+            serverExt.ext('onPreResponse', function (request, next) {
+
+                next();
+            });
+
+            serverExt.inject('/', function (res) {
+
+                expect(res.statusCode).to.equal(503);
+                done();
+            });
+        });
+
         it('does not return an error response when server is slow but faster than timeout', function (done) {
 
             var server = new Hapi.Server({ timeout: { server: 50 } });