minor symfony#30633 Response prepare method update for more coherence (DamienVauchel)

fabpot · fabpot · commit 9ee524873151 · 2019-03-22T07:11:03.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- Response prepare method update for more coherence $headers has been defined to avoid using $this->headers and is used everywhere but not in these lines. | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT Commits ------- e89c921 Response prepare method update
diff --git a/src/Symfony/Component/HttpFoundation/Response.php b/src/Symfony/Component/HttpFoundation/Response.php
@@ -310,9 +310,9 @@ public function prepare(Request $request)
         }
 
         // Check if we need to send extra expire info headers
-        if ('1.0' == $this->getProtocolVersion() && false !== strpos($this->headers->get('Cache-Control'), 'no-cache')) {
-            $this->headers->set('pragma', 'no-cache');
-            $this->headers->set('expires', -1);
+        if ('1.0' == $this->getProtocolVersion() && false !== strpos($headers->get('Cache-Control'), 'no-cache')) {
+            $headers->set('pragma', 'no-cache');
+            $headers->set('expires', -1);
         }
 
         $this->ensureIEOverSSLCompatibility($request);

Original file line number	Diff line number	Diff line change
`@@ -310,9 +310,9 @@ public function prepare(Request $request)`
`310`	`310`	`}`
`311`	`311`
`312`	`312`	`// Check if we need to send extra expire info headers`
`313`		`- if ('1.0' == $this->getProtocolVersion() && false !== strpos($this->headers->get('Cache-Control'), 'no-cache')) {`
`314`		`- $this->headers->set('pragma', 'no-cache');`
`315`		`- $this->headers->set('expires', -1);`
	`313`	`+ if ('1.0' == $this->getProtocolVersion() && false !== strpos($headers->get('Cache-Control'), 'no-cache')) {`
	`314`	`+ $headers->set('pragma', 'no-cache');`
	`315`	`+ $headers->set('expires', -1);`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`$this->ensureIEOverSSLCompatibility($request);`