Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request rails#5338 from mreinsch/3-2-static_invalid_byte_s…
…equence

3 2 static invalid byte sequence
  • Loading branch information
tenderlove committed Mar 15, 2012
2 parents 9dfb41f + 55cac81 commit f918137
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions actionpack/lib/action_dispatch/middleware/static.rb
Expand Up @@ -38,6 +38,7 @@ def unescape_path(path)
end

def escape_glob_chars(path)
path.force_encoding('binary') if path.respond_to? :force_encoding
path.gsub(/[*?{}\[\]]/, "\\\\\\&")
end
end
Expand Down
4 changes: 4 additions & 0 deletions actionpack/test/dispatch/static_test.rb
Expand Up @@ -6,6 +6,10 @@ def test_serves_dynamic_content
assert_equal "Hello, World!", get("/nofile").body
end

def test_handles_urls_with_bad_encoding
assert_equal "Hello, World!", get("/doorkeeper%E3E4").body
end

def test_sets_cache_control
response = get("/index.html")
assert_html "/index.html", response
Expand Down

0 comments on commit f918137

Please sign in to comment.