aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-xactionpack/lib/action_controller/request.rb2
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