Merge pull request #1035 from nextcloud/enhancement/proxydownloadresponse-caching

Use CacheHeaders trait for the ProxyDownloadResponse class

1 files changed, 8 insertions, 4 deletions

diff --git a/lib/Http/ProxyDownloadResponse.php b/lib/Http/ProxyDownloadResponse.php
index b5da41d75..c8af04ee3 100644
--- a/lib/Http/ProxyDownloadResponse.php
+++ b/lib/Http/ProxyDownloadResponse.php
@@ -25,10 +25,14 @@ declare(strict_types=1);
 namespace OCA\Mail\Http;
 
 use DateTime;
+use OC;
 use OCP\AppFramework\Http\DownloadResponse;
+use OCP\AppFramework\Utility\ITimeFactory;
 
 class ProxyDownloadResponse extends DownloadResponse {
 
+	use CacheHeaders;
+
 	/** @var string */
 	private $content;
 
@@ -47,10 +51,10 @@ class ProxyDownloadResponse extends DownloadResponse {
 
 		$this->content = $content;
 
-		$expires = new DateTime('now + 11 months');
-		$this->addHeader('Expires', $expires->format(DateTime::RFC1123));
-		$this->addHeader('Cache-Control', 'private');
-		$this->addHeader('Pragma', 'cache');
+		$time = OC::$server->query(ITimeFactory::class);
+		$now = (new DateTime('now'))->getTimestamp();
+		$expires = (new DateTime('now + 11 months'))->getTimestamp();
+		$this->setCacheHeaders($expires - $now, $time);
 	}
 
 	/**