diff options
author | Andrew White <andrew.white@unboxed.co> | 2018-03-21 16:33:36 +0000 |
---|---|---|
committer | Andrew White <andrew.white@unboxed.co> | 2018-03-22 04:23:49 +0000 |
commit | 2ef145883348e92c9e6393ece9b6967e3a5a80c7 (patch) | |
tree | 0bc7a1fa19ce01b25a1e692c821aa37158355ec5 /actionpack/test/dispatch | |
parent | 4c9c3ffc2e80155f31dbcf80591618ed1c858685 (diff) | |
download | rails-2ef145883348e92c9e6393ece9b6967e3a5a80c7.tar.gz rails-2ef145883348e92c9e6393ece9b6967e3a5a80c7.tar.bz2 rails-2ef145883348e92c9e6393ece9b6967e3a5a80c7.zip |
Use ASCII-8BIT paths in ActionDispatch::Static
The rack gem returns PATH_INFO as an ASCII-8BIT encoded string but it
was being converted to US-ASCII by the match? method because it was
calling Rack::Utils.escape_path. To prevent incompatibile encoding
warnings use ASCII-8BIT strings for the root path and let Ruby handle
any filename encoding conversion.
Fixes #32294, Closes #32314.
Diffstat (limited to 'actionpack/test/dispatch')
-rw-r--r-- | actionpack/test/dispatch/static_test.rb | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb index 0bdff68692..6b69cd9999 100644 --- a/actionpack/test/dispatch/static_test.rb +++ b/actionpack/test/dispatch/static_test.rb @@ -71,7 +71,16 @@ module StaticTests end def test_served_static_file_with_non_english_filename - assert_html "means hello in Japanese\n", get("/foo/#{Rack::Utils.escape("こんにちは.html")}") + assert_html "means hello in Japanese\n", get("/foo/%E3%81%93%E3%82%93%E3%81%AB%E3%81%A1%E3%81%AF.html") + end + + def test_served_gzipped_static_file_with_non_english_filename + response = get("/foo/%E3%81%95%E3%82%88%E3%81%86%E3%81%AA%E3%82%89.html", "HTTP_ACCEPT_ENCODING" => "gzip") + + assert_gzip "/foo/さようなら.html", response + assert_equal "text/html", response.headers["Content-Type"] + assert_equal "Accept-Encoding", response.headers["Vary"] + assert_equal "gzip", response.headers["Content-Encoding"] end def test_serves_static_file_with_exclamation_mark_in_filename |