Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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