From 508316a19c48c917393efaa05b227350648b0aac Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Fri, 5 Feb 2010 01:05:47 +0000 Subject: [PATCH] BUGFIX: Don't force SSL when running from CLI git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@98272 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/control/Director.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/control/Director.php b/core/control/Director.php index 6bc2ef05e..cac254a43 100755 --- a/core/control/Director.php +++ b/core/control/Director.php @@ -598,7 +598,7 @@ class Director { * */ static function forceSSL() { - if((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') && !Director::isDev()) { + if((!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] == 'off') && !Director::isDev() && !Director::is_cli()) { $destURL = str_replace('http:', 'https:', Director::absoluteURL($_SERVER['REQUEST_URI'])); header("Location: $destURL", true, 301);