aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2012-02-17 01:42:06 -0800
committerJosé Valim <jose.valim@plataformatec.com.br>2012-02-17 01:42:06 -0800
commit4bb6ed7744c482dad6b71cffc19a0c86b730b730 (patch)
tree4aa9ce75aa96831ddf1c153799f9c83d8236a12d /actionpack/lib
parentdecafdd57a2c992a15df894cc43cd0a7ff6ea985 (diff)
parentd07b2f3e295031b4a2b6a3f8c80d7e92a78329c2 (diff)
downloadrails-4bb6ed7744c482dad6b71cffc19a0c86b730b730.tar.gz
rails-4bb6ed7744c482dad6b71cffc19a0c86b730b730.tar.bz2
rails-4bb6ed7744c482dad6b71cffc19a0c86b730b730.zip
Merge pull request #5066 from lest/patch-1
escape static file path to prevent double unescaping
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/middleware/static.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index 404943d720..11c346926c 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -18,7 +18,7 @@ module ActionDispatch
match = matches.detect { |m| File.file?(m) }
if match
match.sub!(@compiled_root, '')
- match
+ ::Rack::Utils.escape(match)
end
end