Commit: 70fa3802880f914bd6b33bb3bae465a06a62151a - pukiwiki (git)

Commit MetaInfo

• Revisión: 70fa3802880f914bd6b33bb3bae465a06a62151a (tree)
• Tiempo: 2014-07-13 05:02:56
• Autor: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

BugTrack2/354: Implement RFC 6266 to support non-ASCII filename of Attach

* RFC 6266: Use of the Content-Disposition Header Field in the Hypertext Transfer Protocol

- http://www.ietf.org/rfc/rfc6266.txt

* RFC2231: MIME Parameter Value and Encoded Word Extensions: Character Sets, Languages, and Continuations

- http://www.ietf.org/rfc/rfc2231.txt

* RFC 5987: Character Set and Language Encoding for Hypertext Transfer Protocol (HTTP) Header Field Parameters

- http://www.ietf.org/rfc/rfc5987.txt

Cambiar Resumen

• modified: plugin/attach.inc.php
• modified: plugin/ref.inc.php

Diferencia incremental

--- a/plugin/attach.inc.php
+++ b/plugin/attach.inc.php
@@ -711,13 +711,13 @@ EOD;
 				break;
 			}
 		}
-		$filename = htmlsc($filename);
+		$utf8filename = mb_convert_encoding($filename, 'UTF-8', 'auto');
 
 		ini_set('default_charset', '');
 		mb_http_output('pass');
 
 		pkwk_common_headers();
-		header('Content-Disposition: inline; filename="' . $filename . '"');
+		header('Content-Disposition: inline; filename="' . $filename . '"; filename*=utf-8\'\'' . rawurlencode($utf8filename));
 		header('Content-Length: ' . $this->size);
 		header('Content-Type: '   . $this->type);
 

--- a/plugin/ref.inc.php
+++ b/plugin/ref.inc.php
@@ -420,12 +420,12 @@ function plugin_ref_action()
 			break;
 		}
 	}
-	$file = htmlsc($filename);
+	$utf8filename = mb_convert_encoding($filename, 'UTF-8', 'auto');
 	$size = filesize($ref);
 
 	// Output
 	pkwk_common_headers();
-	header('Content-Disposition: inline; filename="' . $filename . '"');
+	header('Content-Disposition: inline; filename="' . $filename . '"; filename*=utf-8\'\'' . rawurlencode($utf8filename));
 	header('Content-Length: ' . $size);
 	header('Content-Type: '   . $type);
 	@readfile($ref);