merged branch Tobion/patch-3 (PR #5276)

fabpot · fabpot · commit 71d2301726ae · 2012-08-17T10:16:33.000+02:00
Commits ------- bdaa877 [HttpFoundation] fix #5271 (duplicated header in JsonResponse) Discussion ---------- fix JsonResponse: duplicate header fix #5271 --------------------------------------------------------------------------- by Tobion at 2012-08-16T16:50:04Z Will look into the failing test later. --------------------------------------------------------------------------- by Tobion at 2012-08-16T23:55:45Z Finished.
diff --git a/src/Symfony/Component/HttpFoundation/JsonResponse.php b/src/Symfony/Component/HttpFoundation/JsonResponse.php
@@ -97,12 +97,16 @@ protected function update()
     {
         if (null !== $this->callback) {
             // Not using application/javascript for compatibility reasons with older browsers.
-            $this->headers->set('Content-Type', 'text/javascript', true);
+            $this->headers->set('Content-Type', 'text/javascript');
 
             return $this->setContent(sprintf('%s(%s);', $this->callback, $this->data));
         }
 
-        $this->headers->set('Content-Type', 'application/json', false);
+        // Only set the header when there is none or when it equals 'text/javascript' (from a previous update with callback)
+        // in order to not overwrite a custom definition.
+        if (!$this->headers->has('Content-Type') || 'text/javascript' === $this->headers->get('Content-Type')) {
+            $this->headers->set('Content-Type', 'application/json');
+        }
 
         return $this->setContent($this->data);
     }

Original file line number	Diff line number	Diff line change
`@@ -97,12 +97,16 @@ protected function update()`
`97`	`97`	`{`
`98`	`98`	`if (null !== $this->callback) {`
`99`	`99`	`// Not using application/javascript for compatibility reasons with older browsers.`
`100`		`- $this->headers->set('Content-Type', 'text/javascript', true);`
	`100`	`+ $this->headers->set('Content-Type', 'text/javascript');`
`101`	`101`
`102`	`102`	`return $this->setContent(sprintf('%s(%s);', $this->callback, $this->data));`
`103`	`103`	`}`
`104`	`104`
`105`		`- $this->headers->set('Content-Type', 'application/json', false);`
	`105`	`+ // Only set the header when there is none or when it equals 'text/javascript' (from a previous update with callback)`
	`106`	`+ // in order to not overwrite a custom definition.`
	`107`	`+ if (!$this->headers->has('Content-Type') \|\| 'text/javascript' === $this->headers->get('Content-Type')) {`
	`108`	`+ $this->headers->set('Content-Type', 'application/json');`
	`109`	`+ }`
`106`	`110`
`107`	`111`	`return $this->setContent($this->data);`
`108`	`112`	`}`