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 pull request #2445 from tractorcow/pulls/3.1.0-http-add_cache_headers-fix

Browse Source 
BUG Fix regression introduced in #2356 (method call on non-object)
This commit is contained in:
Sean Harvey 2013-09-22 18:53:06 -07:00
commit 5b47c3aa1c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
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 {
// Grab header for checking. Unfortunately HTTPRequest uses a mistyped variant. if($body) {
$contentDisposition = $body->getHeader('Content-disposition'); // Grab header for checking. Unfortunately HTTPRequest uses a mistyped variant.
if (!$contentDisposition) $contentDisposition = $body->getHeader('Content-Disposition'); $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