From: Clement Wong <git@clement.hk>
Date: Sun, 10 May 2020 18:22:47 +0000 (+0200)
Subject: Add public argument to Http cacheFor()
X-Git-Tag: v19.0.0RC2~9^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e9be3a9090d89f7d3e4c2c0ec51ed4e68499985d;p=nextcloud-server.git

Add public argument to Http cacheFor()

Signed-off-by: Clement Wong <git@clement.hk>
---

diff --git a/lib/public/AppFramework/Http/Response.php b/lib/public/AppFramework/Http/Response.php
index 27a2fd3a008..6f418e42553 100644
--- a/lib/public/AppFramework/Http/Response.php
+++ b/lib/public/AppFramework/Http/Response.php
@@ -105,12 +105,11 @@ class Response {
 	 * @return $this
 	 * @since 6.0.0 - return value was added in 7.0.0
 	 */
-	public function cacheFor(int $cacheSeconds) {
+	public function cacheFor(int $cacheSeconds, bool $public = false) {
 		if ($cacheSeconds > 0) {
-			$this->addHeader('Cache-Control', 'private, max-age=' . $cacheSeconds . ', must-revalidate');
-
-			// Old scool prama caching
-			$this->addHeader('Pragma', 'private');
+			$pragma = $public ? 'public' : 'private';
+			$this->addHeader('Cache-Control', $pragma . ', max-age=' . $cacheSeconds . ', must-revalidate');
+			$this->addHeader('Pragma', $pragma);
 
 			// Set expires header
 			$expires = new \DateTime();