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

Merge branch '3.1.0' into 3.1

Browse Source
This commit is contained in:
Sean Harvey 2013-09-23 17:13:09 +12:00
commit f8eaf81ae2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
control/HTTP.php
View File

@ -343,11 +343,14 @@ class HTTP {
$responseHeaders['Vary'] = 'Cookie, X-Forwarded-Protocol, User-Agent, Accept'; $responseHeaders['Vary'] = 'Cookie, X-Forwarded-Protocol, User-Agent, Accept';
} }
else { else {
if($body) {
// Grab header for checking. Unfortunately HTTPRequest uses a mistyped variant. // Grab header for checking. Unfortunately HTTPRequest uses a mistyped variant.
$contentDisposition = $body->getHeader('Content-disposition'); $contentDisposition = $body->getHeader('Content-disposition');
if (!$contentDisposition) $contentDisposition = $body->getHeader('Content-Disposition'); if (!$contentDisposition) $contentDisposition = $body->getHeader('Content-Disposition');
}
if( if(
$body &&
Director::is_https() && Director::is_https() &&
strstr($_SERVER["HTTP_USER_AGENT"], 'MSIE')==true && strstr($_SERVER["HTTP_USER_AGENT"], 'MSIE')==true &&
strstr($contentDisposition, 'attachment;')==true strstr($contentDisposition, 'attachment;')==true