diff --git a/_config/controller.yml b/_config/controller.yml index 00820ab..2ab26f6 100644 --- 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 index c0216a1..cd48297 100644 --- 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