Do not send cache headers with known incorrect path

packaged · Apr 27, 2020 · dde3b40 · dde3b40
1 parent cf727c5
commit dde3b40
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 15 deletions.
diff --git a/src/Dispatch.php b/src/Dispatch.php
@@ -251,7 +251,8 @@ public function handleRequest(Request $request): Response
       $failedHash = false;
     }
 
-    if((!$relativeHash || $failedHash) && $fileHash === $manager->getFileHash($fullPath))
+    $contentHashMatch = $fileHash === $manager->getFileHash($fullPath);
+    if((!$relativeHash || $failedHash) && $contentHashMatch)
     {
       $failedHash = false;
     }
@@ -281,7 +282,7 @@ public function handleRequest(Request $request): Response
         $resource->setOptions($this->config()->getSection('ext.' . $ext)->getItems());
       }
     }
-    return ResourceFactory::create($resource);
+    return ResourceFactory::create($resource, $contentHashMatch);
   }
 
   public function config()

diff --git a/src/Resources/ResourceFactory.php b/src/Resources/ResourceFactory.php
@@ -112,10 +112,11 @@ public static function getExtensionResource($extension): DispatchResource
   /**
    * @param DispatchResource $resource
    *
+   * @param bool             $cache
+   *
    * @return Response
-   * @throws \Exception
    */
-  public static function create(DispatchResource $resource)
+  public static function create(DispatchResource $resource, $cache = true)
   {
     $response = new Response();
 
@@ -127,20 +128,25 @@ public static function create(DispatchResource $resource)
     //Domain specific content will vary on the uri itself
     $response->headers->set("Vary", "Accept-Encoding");
 
-    //Set the etag to the hash of the request uri, as it is in itself a hash
-    $response->setEtag($resource->getHash());
-    $response->setPublic();
+    if($cache)
+    {
+      //Set the etag to the hash of the request uri, as it is in itself a hash
+      $response->setEtag($resource->getHash());
+      $response->setPublic();
 
-    //This resource should last for 1 year in cache
-    $response->setMaxAge(31536000);
-    $response->setSharedMaxAge(31536000);
-    $response->setExpires((new \DateTime())->add(new \DateInterval('P365D')));
+      //This resource should last for 1 year in cache
+      $response->setMaxAge(31536000);
+      $response->setSharedMaxAge(31536000);
+      $response->setExpires((new \DateTime())->add(new \DateInterval('P365D')));
+
+      //Set the last modified date to now
+      $date = new \DateTime();
+      $date->setTimezone(new \DateTimeZone('UTC'));
+      $response->headers->set('Last-Modified', $date->format('D, d M Y H:i:s') . ' GMT');
+    }
 
-    //Set the last modified date to now
-    $date = new \DateTime();
-    $date->setTimezone(new \DateTimeZone('UTC'));
-    $response->headers->set('Last-Modified', $date->format('D, d M Y H:i:s') . ' GMT');
     $response->setContent($resource->getContent());
+
     return $response;
   }
 }