symfony
diff --git a/‎src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
+14Lines changed: 14 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/BinaryFileResponse.php
+14Lines changed: 14 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
+13Lines changed: 13 additions & 0 deletions b/‎src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/BinaryFileResponseTest.php
+13Lines changed: 13 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpFoundation/Tests/Fixtures/föö.html
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Fixtures/föö.html b/‎src/Symfony/Component/HttpFoundation/Tests/Fixtures/föö.html
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpFoundation/Tests/Fixtures/föö.html
@@ -160,6 +160,20 @@ public function setContentDisposition($disposition, $filename = '', $filenameFal
             $filename = $this->file->getFilename();
         }
 
+        if ('' === $filenameFallback && (!preg_match('/^[\x20-\x7e]*$/', $filename) || false !== strpos($filename, '%'))) {
+            $encoding = mb_detect_encoding($filename, null, true);
+
+            for ($i = 0; $i < mb_strlen($filename, $encoding); ++$i) {
+                $char = mb_substr($filename, $i, 1, $encoding);
+
+                if ('%' === $char || ord($char) < 32 || ord($char) > 126) {
+                    $filenameFallback .= '_';
+                } else {
+                    $filenameFallback .= $char;
+                }
+            }
+        }
+
         $dispositionHeader = $this->headers->makeDisposition($disposition, $filename, $filenameFallback);
         $this->headers->set('Content-Disposition', $dispositionHeader);
 
 
@@ -34,6 +34,11 @@ public function testConstruction()
         $this->assertEquals('inline; filename="README.md"', $response->headers->get('Content-Disposition'));
     }
 
+    public function testConstructWithNonAsciiFilename()
+    {
+        new BinaryFileResponse(__DIR__.'/Fixtures/föö.html', 200, array(), true, 'attachment');
+    }
+
     /**
      * @expectedException \LogicException
      */
@@ -49,6 +54,14 @@ public function testGetContent()
         $this->assertFalse($response->getContent());
     }
 
+    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'));
+    }
+
     /**
      * @dataProvider provideRanges
      */