tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

FIX HTTP Headers are case insensitive

Browse Source
This commit is contained in:
Daniel Hensby 2017-09-13 16:02:12 +01:00
parent c7c0ee39f1
commit 9198313658
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/Control/HTTPRequest.php
View File

@ -349,12 +349,14 @@ class HTTPRequest implements ArrayAccess
/** /**
* Add a HTTP header to the response, replacing any header of the same name. * Add a HTTP header to the response, replacing any header of the same name.
* *
* @param string $header Example: "Content-Type" * @param string $header Example: "content-type"
* @param string $value Example: "text/xml" * @param string $value Example: "text/xml"
*/ */
public function addHeader($header, $value) public function addHeader($header, $value)
{ {
$header = strtolower($header);
$this->headers[$header] = $value; $this->headers[$header] = $value;
return $this;
} }
/** /**
@ -373,6 +375,7 @@ class HTTPRequest implements ArrayAccess
*/ */
public function getHeader($header) public function getHeader($header)
{ {
$header = strtolower($header);
return (isset($this->headers[$header])) ? $this->headers[$header] : null; return (isset($this->headers[$header])) ? $this->headers[$header] : null;
} }
@ -385,9 +388,8 @@ class HTTPRequest implements ArrayAccess
*/ */
public function removeHeader($header) public function removeHeader($header)
{ {
if (isset($this->headers[$header])) { $header = strtolower($header);
unset($this->headers[$header]); unset($this->headers[$header]);
}
return $this; return $this;
} }
@ -428,7 +430,7 @@ class HTTPRequest implements ArrayAccess
{ {
return ( return (
$this->requestVar('ajax') || $this->requestVar('ajax') ||
$this->getHeader('X-Requested-With') === "XMLHttpRequest" $this->getHeader('x-requested-with') === "XMLHttpRequest"
); );
} }
@ -483,10 +485,10 @@ class HTTPRequest implements ArrayAccess
$mimeType = HTTP::get_mime_type($fileName); $mimeType = HTTP::get_mime_type($fileName);
} }
$response = new HTTPResponse($fileData); $response = new HTTPResponse($fileData);
$response->addHeader("Content-Type", "$mimeType; name=\"" . addslashes($fileName) . "\""); $response->addHeader("content-type", "$mimeType; name=\"" . addslashes($fileName) . "\"");
// Note a IE-only fix that inspects this header in HTTP::add_cache_headers(). // Note a IE-only fix that inspects this header in HTTP::add_cache_headers().
$response->addHeader("Content-Disposition", "attachment; filename=\"" . addslashes($fileName) . "\""); $response->addHeader("content-disposition", "attachment; filename=\"" . addslashes($fileName) . "\"");
$response->addHeader("Content-Length", strlen($fileData)); $response->addHeader("content-length", strlen($fileData));
return $response; return $response;
} }
@ -809,7 +811,7 @@ class HTTPRequest implements ArrayAccess
public function getAcceptMimetypes($includeQuality = false) public function getAcceptMimetypes($includeQuality = false)
{ {
$mimetypes = array(); $mimetypes = array();
$mimetypesWithQuality = preg_split('#\s*,\s*#', $this->getHeader('Accept')); $mimetypesWithQuality = preg_split('#\s*,\s*#', $this->getHeader('accept'));
foreach ($mimetypesWithQuality as $mimetypeWithQuality) { foreach ($mimetypesWithQuality as $mimetypeWithQuality) {
$mimetypes[] = ($includeQuality) ? $mimetypeWithQuality : preg_replace('/;.*/', '', $mimetypeWithQuality); $mimetypes[] = ($includeQuality) ? $mimetypeWithQuality : preg_replace('/;.*/', '', $mimetypeWithQuality);
} }

13
src/Control/HTTPResponse.php
View File

@ -85,13 +85,13 @@ class HTTPResponse
protected $statusDescription = "OK"; protected $statusDescription = "OK";
/** /**
* HTTP Headers like "Content-Type: text/xml" * HTTP Headers like "content-type: text/xml"
* *
* @see http://en.wikipedia.org/wiki/List_of_HTTP_headers * @see http://en.wikipedia.org/wiki/List_of_HTTP_headers
* @var array * @var array
*/ */
protected $headers = array( protected $headers = array(
"Content-Type" => "text/html; charset=utf-8", "content-type" => "text/html; charset=utf-8",
); );
/** /**
@ -200,12 +200,13 @@ class HTTPResponse
/** /**
* Add a HTTP header to the response, replacing any header of the same name. * Add a HTTP header to the response, replacing any header of the same name.
* *
* @param string $header Example: "Content-Type" * @param string $header Example: "content-type"
* @param string $value Example: "text/xml" * @param string $value Example: "text/xml"
* @return $this * @return $this
*/ */
public function addHeader($header, $value) public function addHeader($header, $value)
{ {
$header = strtolower($header);
$this->headers[$header] = $value; $this->headers[$header] = $value;
return $this; return $this;
} }
@ -218,6 +219,7 @@ class HTTPResponse
*/ */
public function getHeader($header) public function getHeader($header)
{ {
$header = strtolower($header);
if (isset($this->headers[$header])) { if (isset($this->headers[$header])) {
return $this->headers[$header]; return $this->headers[$header];
} }
@ -241,6 +243,7 @@ class HTTPResponse
*/ */
public function removeHeader($header) public function removeHeader($header)
{ {
strtolower($header);
unset($this->headers[$header]); unset($this->headers[$header]);
return $this; return $this;
} }
@ -257,7 +260,7 @@ class HTTPResponse
$code = 302; $code = 302;
} }
$this->setStatusCode($code); $this->setStatusCode($code);
$this->addHeader('Location', $dest); $this->addHeader('location', $dest);
return $this; return $this;
} }
@ -285,7 +288,7 @@ class HTTPResponse
protected function htmlRedirect() protected function htmlRedirect()
{ {
$headersSent = headers_sent($file, $line); $headersSent = headers_sent($file, $line);
$location = $this->getHeader('Location'); $location = $this->getHeader('location');
$url = Director::absoluteURL($location); $url = Director::absoluteURL($location);
$urlATT = Convert::raw2htmlatt($url); $urlATT = Convert::raw2htmlatt($url);
$urlJS = Convert::raw2js($url); $urlJS = Convert::raw2js($url);