harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add modified date in Etag hash calculation

Browse Source
This commit is contained in:
Max Kostikov 2019-04-24 11:13:17 +02:00
parent 54f95389a8
commit 9104933b18
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Zotlabs/Module/Photo.php
View File

@ -95,7 +95,7 @@ class Photo extends \Zotlabs\Web\Controller {
$default = $d['default']; $default = $d['default'];
$data = $d['data']; $data = $d['data'];
$mimetype = $d['mimetype']; $mimetype = $d['mimetype'];
$modified = time(); $modified = 0;
} }
if(! $data) { if(! $data) {
@ -220,10 +220,15 @@ class Photo extends \Zotlabs\Web\Controller {
if(! $data) if(! $data)
killme(); killme();
$etag = md5($data . $modified);
if($modified == 0)
$modified = time();
header_remove('Pragma'); header_remove('Pragma');
if($_SERVER['HTTP_IF_NONE_MATCH'] === md5($data) || $_SERVER['HTTP_IF_MODIFIED_SINCE'] === gmdate("D, d M Y H:i:s", $modified) . " GMT") { if($_SERVER['HTTP_IF_NONE_MATCH'] === $etag || $_SERVER['HTTP_IF_MODIFIED_SINCE'] === gmdate("D, d M Y H:i:s", $modified) . " GMT") {
header_remove('Expires'); header_remove('Expires');
header_remove('Cache-Control'); header_remove('Cache-Control');
header_remove('Set-Cookie'); header_remove('Set-Cookie');
@ -272,7 +277,7 @@ class Photo extends \Zotlabs\Web\Controller {
header("Content-type: " . $mimetype); header("Content-type: " . $mimetype);
header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified) . " GMT"); header("Last-Modified: " . gmdate("D, d M Y H:i:s", $modified) . " GMT");
header("ETag: " . md5($data)); header("ETag: " . $etag);
header("Content-Length: " . (isset($filesize) ? $filesize : strlen($data))); header("Content-Length: " . (isset($filesize) ? $filesize : strlen($data)));
// If it's a file resource, stream it. // If it's a file resource, stream it.