hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge with 3.7

Browse Source
This commit is contained in:
Romain Neutron
2012-10-24 13:45:02 +02:00
parent 6e0f469e02 f52ac63e0d
commit becee5f233
4 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/classes/set/export.class.php
View File

@@ -787,25 +787,18 @@ class set_export extends set_abstract
);
$response->headers->set('X-Sendfile', $file);
$response->headers->set('X-Accel-Redirect', $file_xaccel);
$response->headers->set('Pragma', 'public', true);
$response->setMaxAge(0);
$response->headers->set('Content-Type', $mime);
$response->headers->set('Content-Length', filesize($file));
$response->headers->set('Content-Disposition', $headerDisposition);
return $response;
} else {
/**
*
* Header "Pragma: public" SHOULD be present.
* In case it is not present, download on IE 8 and previous over HTTPS
* will fail.
*
* @todo : merge this shitty fix with Response object.
*
*/
if (!headers_sent()) {
header("Pragma: public");
}
$response->headers->set('Pragma', 'public', true);
$response->setMaxAge(0);
$response->headers->set('Content-Type', $mime);
$response->headers->set('Content-Length', filesize($file));