diff options
Diffstat (limited to 'lib/public/appframework')
-rw-r--r-- | lib/public/appframework/controller.php | 1 | ||||
-rw-r--r-- | lib/public/appframework/http.php | 1 | ||||
-rw-r--r-- | lib/public/appframework/http/jsonresponse.php | 1 | ||||
-rw-r--r-- | lib/public/appframework/http/response.php | 9 | ||||
-rw-r--r-- | lib/public/appframework/http/templateresponse.php | 1 | ||||
-rw-r--r-- | lib/public/appframework/iapi.php | 1 | ||||
-rw-r--r-- | lib/public/appframework/middleware.php | 1 |
7 files changed, 4 insertions, 11 deletions
diff --git a/lib/public/appframework/controller.php b/lib/public/appframework/controller.php index 1642b508572..320e0cfebb2 100644 --- a/lib/public/appframework/controller.php +++ b/lib/public/appframework/controller.php @@ -1,5 +1,4 @@ <?php - /** * ownCloud - App Framework * diff --git a/lib/public/appframework/http.php b/lib/public/appframework/http.php index c05d8f8e46e..c584d4ec670 100644 --- a/lib/public/appframework/http.php +++ b/lib/public/appframework/http.php @@ -1,5 +1,4 @@ <?php - /** * ownCloud - App Framework * diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php index fa7d32596e8..7c2b609bc2e 100644 --- a/lib/public/appframework/http/jsonresponse.php +++ b/lib/public/appframework/http/jsonresponse.php @@ -1,5 +1,4 @@ <?php - /** * ownCloud - App Framework * diff --git a/lib/public/appframework/http/response.php b/lib/public/appframework/http/response.php index 54dc860fec2..f776878a814 100644 --- a/lib/public/appframework/http/response.php +++ b/lib/public/appframework/http/response.php @@ -1,5 +1,4 @@ <?php - /** * ownCloud - App Framework * @@ -71,7 +70,7 @@ class Response { public function cacheFor($cacheSeconds) { if($cacheSeconds > 0) { - $this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds . + $this->addHeader('Cache-Control', 'max-age=' . $cacheSeconds . ', must-revalidate'); } else { $this->addHeader('Cache-Control', 'no-cache, must-revalidate'); @@ -101,16 +100,16 @@ class Response { */ public function getHeaders() { $mergeWith = array(); - + if($this->lastModified) { - $mergeWith['Last-Modified'] = + $mergeWith['Last-Modified'] = $this->lastModified->format(\DateTime::RFC2822); } if($this->ETag) { $mergeWith['ETag'] = '"' . $this->ETag . '"'; } - + return array_merge($mergeWith, $this->headers); } diff --git a/lib/public/appframework/http/templateresponse.php b/lib/public/appframework/http/templateresponse.php index 594530651aa..6156f8062fc 100644 --- a/lib/public/appframework/http/templateresponse.php +++ b/lib/public/appframework/http/templateresponse.php @@ -1,5 +1,4 @@ <?php - /** * ownCloud - App Framework * diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php index 3bde4c9d4e7..a22b056635e 100644 --- a/lib/public/appframework/iapi.php +++ b/lib/public/appframework/iapi.php @@ -1,5 +1,4 @@ <?php - /** * ownCloud - App Framework * diff --git a/lib/public/appframework/middleware.php b/lib/public/appframework/middleware.php index 94f71ea8520..c4ee1c0dbae 100644 --- a/lib/public/appframework/middleware.php +++ b/lib/public/appframework/middleware.php @@ -1,5 +1,4 @@ <?php - /** * ownCloud - App Framework * |