Merge pull request #8 from hapijs/hapi8

passThrough changes

lib/index.js

@@ -74,7 +74,7 @@ exports.handler = function (route, options) {
                 payload: request.payload,
                 redirects: settings.redirects,
                 timeout: settings.timeout,
-                agent: internals.agent(protocol, settings, request.server)
+                agent: internals.agent(protocol, settings, request.connection)
             };
 
             var bind = request.route.bind || request._route._env.bind || null;
@@ -88,14 +88,14 @@ exports.handler = function (route, options) {
                 }
 
                 if (options.headers.cookie &&
-                    request.server._stateDefinitions.names.length) {
+                    request.connection._stateDefinitions.names.length) {
 
                     delete options.headers.cookie;
 
                     var exclude = [];
-                    for (var i = 0, il = request.server._stateDefinitions.names.length; i < il; ++i) {
-                        var name = request.server._stateDefinitions.names[i];
-                        var definition = request.server._stateDefinitions.cookies[name];
+                    for (var i = 0, il = request.connection._stateDefinitions.names.length; i < il; ++i) {
+                        var name = request.connection._stateDefinitions.names[i];
+                        var definition = request.connection._stateDefinitions.cookies[name];
                         var passCookie = definition.passThrough !== undefined ? definition.passThrough : settings.localStatePassThrough;
                         if (!passCookie) {
                             exclude.push(name);
@@ -158,9 +158,10 @@ exports.handler = function (route, options) {
                     return settings.onResponse.call(bind, null, res, request, reply, settings, ttl);
                 }
 
-                return reply(res)
+                var response = reply(res)
                     .ttl(ttl)
-                    .passThrough(settings.passThrough || false);   // Default to false
+                    .code(res.statusCode)
+                    .passThrough(!!settings.passThrough);   // Default to false
             });
         });
     };
@@ -188,9 +189,9 @@ internals.mapUri = function (protocol, host, port, uri) {
                 return next(null, uri);
             }
 
-            var address = uri.replace(/{protocol}/g, request.server.info.protocol)
-                             .replace(/{host}/g, request.server.info.host)
-                             .replace(/{port}/g, request.server.info.port)
+            var address = uri.replace(/{protocol}/g, request.connection.info.protocol)
+                             .replace(/{host}/g, request.connection.info.host)
+                             .replace(/{port}/g, request.connection.info.port)
                              .replace(/{path}/g, request.url.path);
 
             return next(null, address);
@@ -214,7 +215,7 @@ internals.mapUri = function (protocol, host, port, uri) {
 };
 
 
-internals.agent = function (protocol, settings, server) {
+internals.agent = function (protocol, settings, connection) {
 
     if (settings.agent) {
         return settings.agent;
@@ -224,8 +225,8 @@ internals.agent = function (protocol, settings, server) {
         return undefined;
     }
 
-    internals.agents[server.info.uri] = internals.agents[server.info.uri] || {};
-    var agents = internals.agents[server.info.uri];
+    internals.agents[connection.info.uri] = internals.agents[connection.info.uri] || {};
+    var agents = internals.agents[connection.info.uri];
 
     var type = (protocol === 'http' ? 'http' : (settings.rejectUnauthorized === false ? 'insecure' : 'https'));
     if (!agents[type]) {

package.json

@@ -22,7 +22,7 @@
   },
   "devDependencies": {
     "code": "1.x.x",
-    "hapi": "7.x.x",
+    "hapi": "8.x.x",
     "lab": "5.x.x"
   },
   "scripts": {