diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2013-12-29 18:24:02 +0000 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2013-12-29 18:38:53 +0000 |
| commit | 436ed5171199ae1764ce413044dad8d1556b7791 (patch) | |
| tree | 3e7cb66e32d0669b48738e8ea86c6fdbff2af694 /actionpack/test/fixtures | |
| parent | 54ccc58c6208601a5714cff1b05418979656bf22 (diff) | |
| download | rails-436ed5171199ae1764ce413044dad8d1556b7791.tar.gz rails-436ed5171199ae1764ce413044dad8d1556b7791.tar.bz2 rails-436ed5171199ae1764ce413044dad8d1556b7791.zip | |
Fix Encoding::CompatibilityError when public path is UTF-8
In #5337 we forced the path encoding to ASCII-8BIT to prevent static
file handling from blowing up before an application has had chance to
deal with possibly invalid urls. However this has a negative side
effect of making it an incompatible encoding if the application's
public path has UTF-8 characters in it.
To work around the problem we check to see if the path has a valid
encoding once it has been unescaped. If it is not valid then we can
return early since it will not match any file anyway.
Fixes #13518
Diffstat (limited to 'actionpack/test/fixtures')
| -rw-r--r-- | actionpack/test/fixtures/公共/foo/bar.html | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/公共/foo/baz.css | 3 | ||||
| -rw-r--r-- | actionpack/test/fixtures/公共/foo/index.html | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/公共/foo/こんにちは.html | 1 | ||||
| -rw-r--r-- | actionpack/test/fixtures/公共/index.html | 1 |
5 files changed, 7 insertions, 0 deletions
diff --git a/actionpack/test/fixtures/公共/foo/bar.html b/actionpack/test/fixtures/公共/foo/bar.html new file mode 100644 index 0000000000..9a35646205 --- /dev/null +++ b/actionpack/test/fixtures/公共/foo/bar.html @@ -0,0 +1 @@ +/foo/bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/公共/foo/baz.css b/actionpack/test/fixtures/公共/foo/baz.css new file mode 100644 index 0000000000..b5173fbef2 --- /dev/null +++ b/actionpack/test/fixtures/公共/foo/baz.css @@ -0,0 +1,3 @@ +body { +background: #000; +} diff --git a/actionpack/test/fixtures/公共/foo/index.html b/actionpack/test/fixtures/公共/foo/index.html new file mode 100644 index 0000000000..497a2e898f --- /dev/null +++ b/actionpack/test/fixtures/公共/foo/index.html @@ -0,0 +1 @@ +/foo/index.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/公共/foo/こんにちは.html b/actionpack/test/fixtures/公共/foo/こんにちは.html new file mode 100644 index 0000000000..1df9166522 --- /dev/null +++ b/actionpack/test/fixtures/公共/foo/こんにちは.html @@ -0,0 +1 @@ +means hello in Japanese diff --git a/actionpack/test/fixtures/公共/index.html b/actionpack/test/fixtures/公共/index.html new file mode 100644 index 0000000000..525950ba6b --- /dev/null +++ b/actionpack/test/fixtures/公共/index.html @@ -0,0 +1 @@ +/index.html
\ No newline at end of file |