From 64964f740240e23844dc6eb8bebb44ae263d3eec Mon Sep 17 00:00:00 2001
From: Andrew Aitken-Fincham <andrew@silverstripe.com>
Date: Mon, 23 Apr 2018 17:01:28 +0100
Subject: [PATCH] unset http scheme on CLIRequestBuilder

---
 src/Control/CLIRequestBuilder.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/Control/CLIRequestBuilder.php b/src/Control/CLIRequestBuilder.php
index 660ffb7e0..9ad888355 100644
--- a/src/Control/CLIRequestBuilder.php
+++ b/src/Control/CLIRequestBuilder.php
@@ -2,6 +2,8 @@
 
 namespace SilverStripe\Control;
 
+use SilverStripe\Core\Environment;
+
 /**
  * CLI specific request building logic
  */
@@ -66,4 +68,19 @@ class CLIRequestBuilder extends HTTPRequestBuilder
         // Parse rest of variables as standard
         return parent::cleanEnvironment($variables);
     }
+
+    /**
+     * @param array $variables
+     * @param string $input
+     * @return HTTPRequest
+     */
+    public static function createFromVariables(array $variables, $input)
+    {
+        $request = parent::createFromVariables($variables, $input);
+        // unset scheme so that SS_BASE_URL can provide `is_https` information if required
+        $scheme = parse_url(Environment::getEnv('SS_BASE_URL'), PHP_URL_SCHEME);
+        $request->setScheme($scheme);
+
+        return $request;
+    }
 }