diff options
| author | Andrew White <andyw@pixeltrix.co.uk> | 2012-02-17 13:33:44 +0000 |
|---|---|---|
| committer | Andrew White <andyw@pixeltrix.co.uk> | 2012-02-17 14:07:48 +0000 |
| commit | ceb288b8ce552a248f141bddbd16426641a4fd0d (patch) | |
| tree | b7f3fe70fa7c531e7520fd61cf3e08820d5369f6 /actionpack/test/fixtures | |
| parent | ce51edb73bce5e213568fd5a362fb3557a06aee1 (diff) | |
| download | rails-ceb288b8ce552a248f141bddbd16426641a4fd0d.tar.gz rails-ceb288b8ce552a248f141bddbd16426641a4fd0d.tar.bz2 rails-ceb288b8ce552a248f141bddbd16426641a4fd0d.zip | |
Fix ActionDispatch::Static to serve files with unencoded PCHAR
RFC 3986[1] allows sub-delim characters in path segments unencoded,
however Rack::File requires them to be encoded so we use URI's
unescape method to leave them alone and then escape them again.
Also since the path gets passed to Dir[] we need to escape any glob
characters in the path.
[1]: http://www.ietf.org/rfc/rfc3986.txt
Diffstat (limited to 'actionpack/test/fixtures')
12 files changed, 12 insertions, 1 deletions
diff --git a/actionpack/test/fixtures/public/foo/foo!bar.html b/actionpack/test/fixtures/public/foo/foo!bar.html new file mode 100644 index 0000000000..2928f2717f --- /dev/null +++ b/actionpack/test/fixtures/public/foo/foo!bar.html @@ -0,0 +1 @@ +/foo/foo!bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo$bar.html b/actionpack/test/fixtures/public/foo/foo$bar.html new file mode 100644 index 0000000000..4f837df01d --- /dev/null +++ b/actionpack/test/fixtures/public/foo/foo$bar.html @@ -0,0 +1 @@ +/foo/foo$bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo&bar.html b/actionpack/test/fixtures/public/foo/foo&bar.html new file mode 100644 index 0000000000..c194e8de87 --- /dev/null +++ b/actionpack/test/fixtures/public/foo/foo&bar.html @@ -0,0 +1 @@ +/foo/foo&bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo'bar.html b/actionpack/test/fixtures/public/foo/foo'bar.html new file mode 100644 index 0000000000..25c3275736 --- /dev/null +++ b/actionpack/test/fixtures/public/foo/foo'bar.html @@ -0,0 +1 @@ +/foo/foo'bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo(bar).html b/actionpack/test/fixtures/public/foo/foo(bar).html new file mode 100644 index 0000000000..94fa4cb944 --- /dev/null +++ b/actionpack/test/fixtures/public/foo/foo(bar).html @@ -0,0 +1 @@ +/foo/foo(bar).html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo*bar.html b/actionpack/test/fixtures/public/foo/foo*bar.html new file mode 100644 index 0000000000..79d5194c8d --- /dev/null +++ b/actionpack/test/fixtures/public/foo/foo*bar.html @@ -0,0 +1 @@ +/foo/foo*bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo+bar.html b/actionpack/test/fixtures/public/foo/foo+bar.html index 92c0ad9ac9..0fdc2ecabc 100644 --- a/actionpack/test/fixtures/public/foo/foo+bar.html +++ b/actionpack/test/fixtures/public/foo/foo+bar.html @@ -1 +1 @@ -foo+bar +/foo/foo+bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo,bar.html b/actionpack/test/fixtures/public/foo/foo,bar.html new file mode 100644 index 0000000000..f040fce197 --- /dev/null +++ b/actionpack/test/fixtures/public/foo/foo,bar.html @@ -0,0 +1 @@ +/foo/foo,bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo:bar.html b/actionpack/test/fixtures/public/foo/foo:bar.html new file mode 100644 index 0000000000..7900a2642b --- /dev/null +++ b/actionpack/test/fixtures/public/foo/foo:bar.html @@ -0,0 +1 @@ +/foo/foo:bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo;bar.html b/actionpack/test/fixtures/public/foo/foo;bar.html new file mode 100644 index 0000000000..2248376954 --- /dev/null +++ b/actionpack/test/fixtures/public/foo/foo;bar.html @@ -0,0 +1 @@ +/foo/foo;bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo=bar.html b/actionpack/test/fixtures/public/foo/foo=bar.html new file mode 100644 index 0000000000..206f69e286 --- /dev/null +++ b/actionpack/test/fixtures/public/foo/foo=bar.html @@ -0,0 +1 @@ +/foo/foo=bar.html
\ No newline at end of file diff --git a/actionpack/test/fixtures/public/foo/foo@bar.html b/actionpack/test/fixtures/public/foo/foo@bar.html new file mode 100644 index 0000000000..4e8e90f9b8 --- /dev/null +++ b/actionpack/test/fixtures/public/foo/foo@bar.html @@ -0,0 +1 @@ +/foo/foo@bar.html
\ No newline at end of file |