the-djmaze/snappymail
1
1
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2024-09-20 07:35:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Resolve #887

Browse source
This commit is contained in:
the-djmaze 2023-01-31 17:38:38 +01:00
parent 71eaaf007e
commit 76ae57b481
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
View file

@ -320,21 +320,25 @@ class ServiceActions
$HTTP->max_redirects = 2;
$HTTP->streamBodyTo($tmp);
$oResponse = $HTTP->doRequest('GET', $sUrl);
if ($oResponse && 200 === $oResponse->status
&& \str_starts_with($oResponse->getHeader('content-type'), 'image/')
) try {
$this->oActions->cacheByKey($sData);
\header('Content-Type: ' . $oResponse->getHeader('content-type'));
\header('Cache-Control: public');
\header('Expires: '.\gmdate('D, j M Y H:i:s', 2592000 + \time()).' UTC');
\header('X-Content-Redirect-Location: '.$oResponse->final_uri);
\rewind($tmp);
\fpassthru($tmp);
exit;
} catch (\Throwable $e) {
$msg = \get_class($HTTP) . ': ' . $e->getMessage();
\SnappyMail\Log::error('Proxy', $msg);
// \error_log(\get_class($HTTP) . ': ' . $e->getMessage());
if ($oResponse) {
$sContentType = \SnappyMail\File\MimeType::fromStream($tmp) ?: $oResponse->getHeader('content-type');
if (200 === $oResponse->status && \str_starts_with($sContentType, 'image/')) {
try {
$this->oActions->cacheByKey($sData);
\header('Content-Type: ' . $sContentType);
\header('Cache-Control: public');
\header('Expires: '.\gmdate('D, j M Y H:i:s', 2592000 + \time()).' UTC');
\header('X-Content-Redirect-Location: '.$oResponse->final_uri);
\rewind($tmp);
\fpassthru($tmp);
exit;
} catch (\Throwable $e) {
\header("X-Content-Error: {$e->getMessage()}");
\SnappyMail\Log::error('Proxy', \get_class($HTTP) . ': ' . $e->getMessage());
}
} else {
\header("X-Content-Error: {$oResponse->status} {$sContentType}");
}
}
}
}