firstandthird
diff --git a/‎index.js‎
Lines changed: 5 additions & 1 deletion b/‎index.js‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎test.js‎
Lines changed: 14 additions & 0 deletions b/‎test.js‎
Lines changed: 14 additions & 0 deletions
@@ -2,7 +2,11 @@
 
 exports.register = function (server, options, next) {
   server.ext('onRequest', function (request, reply) {
-    if (request.headers['x-forwarded-proto'] === 'http') {
+    var redirect = options.proxy !== false
+      ? request.headers['x-forwarded-proto'] === 'http'
+      : request.server.info.protocol === 'http'
+
+    if (redirect) {
       return reply()
         .redirect('https://' + request.headers.host + request.url.path)
         .code(301)
 
@@ -19,6 +19,20 @@ test('proxied requests', function (t) {
   })
 })
 
+test('un-proxied requests: options = {proxy: false}', function (t) {
+  t.plan(2)
+
+  Server({proxy: false}).inject({
+    url: '/',
+    headers: {
+      host: 'host'
+    }
+  }, function (response) {
+    t.equal(response.statusCode, 301, 'sets 301 code')
+    t.equal(response.headers.location, 'https://host/', 'sets Location header')
+  })
+})
+
 test('query string', function (t) {
   t.plan(2)