symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
Lines changed: 3 additions & 4 deletions b/‎src/Symfony/Component/HttpFoundation/ResponseHeaderBag.php
Lines changed: 3 additions & 4 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
Lines changed: 3 additions & 3 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
Lines changed: 3 additions & 3 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/ResponseHeaderBagTest.php
Lines changed: 3 additions & 3 deletions
@@ -309,13 +309,12 @@ public function makeDisposition($disposition, $filename, $filenameFallback = '')
             throw new \InvalidArgumentException('The filename and the fallback cannot contain the "/" and "\\" characters.');
         }
 
-        $output = sprintf('%s; filename="%s"', $disposition, str_replace('"', '\\"', $filenameFallback));
-
+        $params = array('filename' => $filenameFallback);
         if ($filename !== $filenameFallback) {
-            $output .= sprintf("; filename*=utf-8''%s", rawurlencode($filename));
+            $params['filename*'] = "utf-8''".rawurlencode($filename);
         }
 
-        return $output;
+        return $disposition.'; '.HeaderUtils::joinAssoc($params, ';');
     }
 
     /**
 
@@ -32,7 +32,7 @@ public function testConstruction()
         $response = BinaryFileResponse::create($file, 404, array(), true, ResponseHeaderBag::DISPOSITION_INLINE);
         $this->assertEquals(404, $response->getStatusCode());
         $this->assertFalse($response->headers->has('ETag'));
-        $this->assertEquals('inline; filename="README.md"', $response->headers->get('Content-Disposition'));
+        $this->assertEquals('inline; filename=README.md', $response->headers->get('Content-Disposition'));
     }
 
     public function testConstructWithNonAsciiFilename()
@@ -66,7 +66,7 @@ public function testSetContentDispositionGeneratesSafeFallbackFilename()
         $response = new BinaryFileResponse(__FILE__);
         $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, 'föö.html');
 
-        $this->assertSame('attachment; filename="f__.html"; filename*=utf-8\'\'f%C3%B6%C3%B6.html', $response->headers->get('Content-Disposition'));
+        $this->assertSame('attachment; filename=f__.html; filename*=utf-8\'\'f%C3%B6%C3%B6.html', $response->headers->get('Content-Disposition'));
     }
 
     public function testSetContentDispositionGeneratesSafeFallbackFilenameForWronglyEncodedFilename()
@@ -77,7 +77,7 @@ public function testSetContentDispositionGeneratesSafeFallbackFilenameForWrongly
         $response->setContentDisposition(ResponseHeaderBag::DISPOSITION_ATTACHMENT, $iso88591EncodedFilename);
 
         // the parameter filename* is invalid in this case (rawurldecode('f%F6%F6') does not provide a UTF-8 string but an ISO-8859-1 encoded one)
-        $this->assertSame('attachment; filename="f__.html"; filename*=utf-8\'\'f%F6%F6.html', $response->headers->get('Content-Disposition'));
+        $this->assertSame('attachment; filename=f__.html; filename*=utf-8\'\'f%F6%F6.html', $response->headers->get('Content-Disposition'));
     }
 
     /**
 
@@ -276,12 +276,12 @@ public function testToStringDoesntMessUpHeaders()
     public function provideMakeDisposition()
     {
         return array(
-            array('attachment', 'foo.html', 'foo.html', 'attachment; filename="foo.html"'),
-            array('attachment', 'foo.html', '', 'attachment; filename="foo.html"'),
+            array('attachment', 'foo.html', 'foo.html', 'attachment; filename=foo.html'),
+            array('attachment', 'foo.html', '', 'attachment; filename=foo.html'),
             array('attachment', 'foo bar.html', '', 'attachment; filename="foo bar.html"'),
             array('attachment', 'foo "bar".html', '', 'attachment; filename="foo \\"bar\\".html"'),
             array('attachment', 'foo%20bar.html', 'foo bar.html', 'attachment; filename="foo bar.html"; filename*=utf-8\'\'foo%2520bar.html'),
-            array('attachment', 'föö.html', 'foo.html', 'attachment; filename="foo.html"; filename*=utf-8\'\'f%C3%B6%C3%B6.html'),
+            array('attachment', 'föö.html', 'foo.html', 'attachment; filename=foo.html; filename*=utf-8\'\'f%C3%B6%C3%B6.html'),
         );
     }
Original file line number	Diff line number	Diff line change
`@@ -309,13 +309,12 @@ public function makeDisposition($disposition, $filename, $filenameFallback = '')`
`309`	`309`	`throw new \InvalidArgumentException('The filename and the fallback cannot contain the "/" and "\\" characters.');`
`310`	`310`	`}`
`311`	`311`
`312`		`- $output = sprintf('%s; filename="%s"', $disposition, str_replace('"', '\\"', $filenameFallback));`
`313`		`-`
	`312`	`+ $params = array('filename' => $filenameFallback);`
`314`	`313`	`if ($filename !== $filenameFallback) {`
`315`		`- $output .= sprintf("; filename*=utf-8''%s", rawurlencode($filename));`
	`314`	`+ $params['filename*'] = "utf-8''".rawurlencode($filename);`
`316`	`315`	`}`
`317`	`316`
`318`		`- return $output;`
	`317`	`+ return $disposition.'; '.HeaderUtils::joinAssoc($params, ';');`
`319`	`318`	`}`
`320`	`319`
`321`	`320`	`/**`