Merge pull request #71 from foxycode/master

Proper enconding of Content-Dispisition filename
nette · Mar 23, 2015 · be8e35b · be8e35b
2 parents 45f4efb + da500c8
commit be8e35b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/Application/Responses/FileResponse.php b/src/Application/Responses/FileResponse.php
@@ -93,7 +93,9 @@ public function send(Nette\Http\IRequest $httpRequest, Nette\Http\IResponse $htt
 	{
 		$httpResponse->setContentType($this->contentType);
 		$httpResponse->setHeader('Content-Disposition',
-			($this->forceDownload ? 'attachment' : 'inline') . '; filename="' . $this->name . '"');
+			($this->forceDownload ? 'attachment' : 'inline')
+				. '; filename="' . $this->name . '"'
+				. '; filename*=utf-8\'\'' . rawurlencode($this->name));
 
 		$filesize = $length = filesize($this->file);
 		$handle = fopen($this->file, 'r');

diff --git a/tests/Application/FileResponse.contentDisposition.phpt b/tests/Application/FileResponse.contentDisposition.phpt
@@ -28,7 +28,7 @@ test(function() {
 	$fileResponse->send(new Http\Request(new Http\UrlScript), $response = new Http\Response);
 
 	Assert::same( $origData, ob_get_clean() );
-	Assert::same( 'attachment; filename="' . $fileName . '"', $response->getHeader('Content-Disposition') );
+	Assert::same( 'attachment; filename="' . $fileName . '"; filename*=utf-8\'\'' . rawurlencode($fileName), $response->getHeader('Content-Disposition') );
 });
 
 
@@ -44,5 +44,19 @@ test(function() {
 	$fileResponse->send(new Http\Request(new Http\UrlScript), $response = new Http\Response);
 
 	Assert::same( $origData, ob_get_clean() );
-	Assert::same('inline; filename="' . $fileName . '"', $response->getHeader('Content-Disposition'));
+	Assert::same('inline; filename="' . $fileName . '"; filename*=utf-8\'\'' . rawurlencode($fileName), $response->getHeader('Content-Disposition'));
+});
+
+
+test(function() {
+	$file = __FILE__;
+	$fileName = 'žluťoučký kůň.txt';
+	$fileResponse = new FileResponse($file, $fileName);
+	$origData = file_get_contents($file);
+
+	ob_start();
+	$fileResponse->send(new Http\Request(new Http\UrlScript), $response = new Http\Response);
+
+	Assert::same( $origData, ob_get_clean() );
+	Assert::same('attachment; filename="' . $fileName . '"; filename*=utf-8\'\'' . rawurlencode($fileName), $response->getHeader('Content-Disposition'));
 });