From 1d402dd513b33d82aef62f56257b887b35be1b3b Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 18 Jun 2013 23:24:22 +0200 Subject: [PATCH] Unset test state in DirectorTest This broke RSSFeedTest when running through 'sake' --- tests/control/DirectorTest.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/control/DirectorTest.php b/tests/control/DirectorTest.php index 213c25e30..7cd8d4cca 100644 --- a/tests/control/DirectorTest.php +++ b/tests/control/DirectorTest.php @@ -309,6 +309,8 @@ class DirectorTest extends SapphireTest { 'HTTP_X_FORWARDED_PROTOCOL', 'HTTPS', 'SSL' ); + $origServer = $_SERVER; + foreach($headers as $header) { if(isset($_SERVER[$header])) { unset($_SERVER['HTTP_X_FORWARDED_PROTOCOL']); @@ -339,6 +341,8 @@ class DirectorTest extends SapphireTest { // https via SSL $_SERVER['SSL'] = ''; $this->assertTrue(Director::is_https()); + + $_SERVER = $origServer; } }