Merge branch 'develop'

praxisnetau · Jan 13, 2018 · 16ef9eb · 16ef9eb
2 parents e49f706 + 2ec2d65
commit 16ef9eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/_config/controller.yml b/_config/controller.yml
@@ -26,7 +26,7 @@ SilverStripe\CMS\Controllers\ContentController:
   dev_server:
     host: localhost
     port: 8080
-    https: false
+    https: auto
     timeout: 10
     fallback: true
   load_js: true

diff --git a/src/Extensions/ControllerExtension.php b/src/Extensions/ControllerExtension.php
@@ -331,13 +331,17 @@ public function getDevServerURL($path = null)
 
                 // Define Protocol:
 
-                $protocol = (isset($config['https']) && $config['https']) ? 'https' : 'http';
+                $protocol = function ($config) {
+                    if (isset($config['https']) && $config['https'] !== 'auto') {
+                        return sprintf('%s:', $config['https'] ? 'https' : 'http');
+                    }
+                };
 
                 // Answer URL String:
 
                 return sprintf(
-                    '%s://%s:%d/%s',
-                    $protocol,
+                    '%s//%s:%d/%s',
+                    $protocol($config),
                     $config['host'],
                     $config['port'],
                     $path