Merge pull request #599 from flightphp/cache-correction

Corrected the cache behavior in some areas
flightphp · Jul 13, 2024 · 7cfaca8 · 7cfaca8
2 parents 8dd255c + 4a93c66
commit 7cfaca8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/flight/Engine.php b/flight/Engine.php
@@ -610,6 +610,7 @@ public function _error(Throwable $e): void
 
         try {
             $this->response()
+                ->cache(0)
                 ->clearBody()
                 ->status(500)
                 ->write($msg)
@@ -736,6 +737,10 @@ public function _delete(string $pattern, $callback, bool $pass_route = false, st
      */
     public function _halt(int $code = 200, string $message = '', bool $actuallyExit = true): void
     {
+        if ($this->response()->getHeader('Cache-Control') === null) {
+            $this->response()->cache(0);
+        }
+
         $this->response()
             ->clearBody()
             ->status($code)

diff --git a/flight/net/Response.php b/flight/net/Response.php
@@ -286,7 +286,7 @@ public function clear(): self
      */
     public function cache($expires): self
     {
-        if ($expires === false) {
+        if ($expires === false || $expires === 0) {
             $this->headers['Expires'] = 'Mon, 26 Jul 1997 05:00:00 GMT';
             $this->headers['Cache-Control'] = 'no-store, no-cache, must-revalidate, max-age=0';
             $this->headers['Pragma'] = 'no-cache';