symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/Response.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Response.php
+1-2Lines changed: 1 addition & 2 deletions b/‎src/Symfony/Component/HttpFoundation/Response.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Response.php
+1-2Lines changed: 1 addition & 2 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
+14Lines changed: 14 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/ResponseTest.php
+14Lines changed: 14 additions & 0 deletions
@@ -1088,8 +1088,7 @@ public function isNotModified(Request $request): bool
         $lastModified = $this->headers->get('Last-Modified');
         $modifiedSince = $request->headers->get('If-Modified-Since');
 
-        if ($ifNoneMatchEtags = $request->getETags()) {
-            $etag = $this->getEtag();
+        if (($ifNoneMatchEtags = $request->getETags()) && (null !== $etag = $this->getEtag())) {
             if (0 == strncmp($etag, 'W/', 2)) {
                 $etag = substr($etag, 2);
             }
 
@@ -287,6 +287,20 @@ public function testIsNotModifiedIfModifiedSinceAndEtagWithoutLastModified()
         $this->assertFalse($response->isNotModified($request));
     }
 
+    public function testIfNoneMatchWithoutETag()
+    {
+        $request = new Request();
+        $request->headers->set('If-None-Match', 'randomly_generated_etag');
+
+        $this->assertFalse((new Response())->isNotModified($request));
+
+        // Test wildcard
+        $request = new Request();
+        $request->headers->set('If-None-Match', '*');
+
+        $this->assertFalse((new Response())->isNotModified($request));
+    }
+
     public function testIsValidateable()
     {
         $response = new Response('', 200, ['Last-Modified' => $this->createDateTimeOneHourAgo()->format(\DATE_RFC2822)]);