diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-07-24 01:20:18 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-07-24 01:20:18 +0000 |
| commit | 937a7abe4556f06e056af33c40a07c3b58652ed7 (patch) | |
| tree | 1d902f77b8e1f4dd932b71941e7b7a732435b712 /actionpack/lib/action_controller/request.rb | |
| parent | 80150a0cfb778a9b7ec765106f0487bf1b7e1bf8 (diff) | |
| download | rails-937a7abe4556f06e056af33c40a07c3b58652ed7.tar.gz rails-937a7abe4556f06e056af33c40a07c3b58652ed7.tar.bz2 rails-937a7abe4556f06e056af33c40a07c3b58652ed7.zip | |
Fixed that file.content_type for uploaded files would include a trailing \r #9053 [bgreenlee]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7212 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/request.rb')
| -rwxr-xr-x | actionpack/lib/action_controller/request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb index 528f076c24..bab265f77e 100755 --- a/actionpack/lib/action_controller/request.rb +++ b/actionpack/lib/action_controller/request.rb @@ -542,7 +542,7 @@ module ActionController filename = CGI.unescape(filename) end - /Content-Type: (.*)/ni.match(head) + /Content-Type: ([^\r]*)/ni.match(head) content_type = ($1 or "") (class << content; self; end).class_eval do |