[HttpFoundation] Postpone setting the date header on a Response

symfony · Jun 9, 2015 · 2ad3b0d · 2ad3b0d
1 parent 567af65
commit 2ad3b0d
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -202,9 +202,6 @@ public function __construct($content = '', $status = 200, $headers = array())
         $this->setContent($content);
         $this->setStatusCode($status);
         $this->setProtocolVersion('1.0');
-        if (!$this->headers->has('Date')) {
-            $this->setDate(new \DateTime(null, new \DateTimeZone('UTC')));
-        }
     }
 
     /**
@@ -333,6 +330,10 @@ public function sendHeaders()
             return $this;
         }
 
+        if (!$this->headers->has('Date')) {
+            $this->setDate(new \DateTime());
+        }
+
         // status
         header(sprintf('HTTP/%s %s %s', $this->version, $this->statusCode, $this->statusText), true, $this->statusCode);
 
@@ -644,7 +645,11 @@ public function mustRevalidate()
      */
     public function getDate()
     {
-        return $this->headers->getDate('Date', new \DateTime());
+        if (!$this->headers->has('Date')) {
+            $this->setDate(new \DateTime());
+        }
+
+        return $this->headers->getDate('Date');
     }
 
     /**