aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-07-25 16:41:33 -0300
committerGitHub <noreply@github.com>2016-07-25 16:41:33 -0300
commit245c64d428279122c5ae2ddfdc4d420a87a88f9a (patch)
tree4d252f8eb7227c45135227d8c944e70d03d01267 /actionpack
parentaa7a6047c21f5ca3ad848f98d438db7d8bcad722 (diff)
parent814ebb996de58da72149bf751d3d40814de6da72 (diff)
downloadrails-245c64d428279122c5ae2ddfdc4d420a87a88f9a.tar.gz
rails-245c64d428279122c5ae2ddfdc4d420a87a88f9a.tar.bz2
rails-245c64d428279122c5ae2ddfdc4d420a87a88f9a.zip
Merge pull request #25950 from jules2689/master
Fix an exception where content-type is nil
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_dispatch/http/parameters.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/parameters.rb b/actionpack/lib/action_dispatch/http/parameters.rb
index 3f0e51790c..ea0e2ee41f 100644
--- a/actionpack/lib/action_dispatch/http/parameters.rb
+++ b/actionpack/lib/action_dispatch/http/parameters.rb
@@ -65,7 +65,7 @@ module ActionDispatch
private
def parse_formatted_parameters(parsers)
- return yield if content_length.zero?
+ return yield if content_length.zero? || content_mime_type.nil?
strategy = parsers.fetch(content_mime_type.symbol) { return yield }