From ff9d40a60d85281d77558c93bece2e9b461bfea4 Mon Sep 17 00:00:00 2001
From: Simon Welsh <simon@simon.geek.nz>
Date: Fri, 28 Feb 2014 14:09:42 +1300
Subject: [PATCH 1/2] FIX Escape the redirect URL before outputting

Signed-off-by: Stephen Shkardoon <stephen@silverstripe.com>
---
 control/HTTPResponse.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/control/HTTPResponse.php b/control/HTTPResponse.php
index e7482bb09..6489740d2 100644
--- a/control/HTTPResponse.php
+++ b/control/HTTPResponse.php
@@ -213,7 +213,7 @@ class SS_HTTPResponse {
 		}
 
 		if(in_array($this->statusCode, self::$redirect_codes) && headers_sent($file, $line)) {
-			$url = $this->headers['Location'];
+			$url = Convert::raw2htmlatt($this->headers['Location']);
 			echo
 			"<p>Redirecting to <a href=\"$url\" title=\"Click this link if your browser does not redirect you\">"
 				. "$url... (output started on $file, line $line)</a></p>

From f8e3bbe3ae3f29f22d85abb73cea033659511168 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 27 Mar 2014 11:00:50 +1300
Subject: [PATCH 2/2] BUG Fix encoding of JS redirection script

---
 control/HTTPResponse.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/control/HTTPResponse.php b/control/HTTPResponse.php
index 6489740d2..6d0ee52b5 100644
--- a/control/HTTPResponse.php
+++ b/control/HTTPResponse.php
@@ -213,12 +213,14 @@ class SS_HTTPResponse {
 		}
 
 		if(in_array($this->statusCode, self::$redirect_codes) && headers_sent($file, $line)) {
-			$url = Convert::raw2htmlatt($this->headers['Location']);
+			$url = (string)$this->headers['Location'];
+			$urlATT = Convert::raw2htmlatt($url);
+			$urlJS = Convert::raw2js($url);
 			echo
-			"<p>Redirecting to <a href=\"$url\" title=\"Click this link if your browser does not redirect you\">"
-				. "$url... (output started on $file, line $line)</a></p>
-			<meta http-equiv=\"refresh\" content=\"1; url=$url\" />
-			<script type=\"text/javascript\">setTimeout('window.location.href = \"$url\"', 50);</script>";
+			"<p>Redirecting to <a href=\"$urlATT\" title=\"Click this link if your browser does not redirect you\">"
+				. "$urlATT... (output started on $file, line $line)</a></p>
+			<meta http-equiv=\"refresh\" content=\"1; url=$urlATT\" />
+			<script type=\"text/javascript\">setTimeout(function(){ window.location.href = \"$urlJS\"; }, 50);</script>";
 		} else {
 			$line = $file = null;
 			if(!headers_sent($file, $line)) {