diff options
| author | José Valim <jose.valim@gmail.com> | 2012-05-07 23:19:41 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2012-05-07 23:19:41 -0700 |
| commit | b86e0be327bfd253056ba6a3afa85abdcf21db69 (patch) | |
| tree | c708127e1d75da36af79be53b309cb29f22cdbea /actionpack/lib/action_controller/metal/head.rb | |
| parent | 7fb268d8dd203cb8e398f18d92d55037ba31cab0 (diff) | |
| parent | 4d527387384cd1a27c2e079bbe1fd0f0505b8d17 (diff) | |
| download | rails-b86e0be327bfd253056ba6a3afa85abdcf21db69.tar.gz rails-b86e0be327bfd253056ba6a3afa85abdcf21db69.tar.bz2 rails-b86e0be327bfd253056ba6a3afa85abdcf21db69.zip | |
Merge pull request #6198 from whistlerbrk/3-2-stable
Address ActionPack head method not respecting explicitly set content-type #3436
Diffstat (limited to 'actionpack/lib/action_controller/metal/head.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/head.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/head.rb b/actionpack/lib/action_controller/metal/head.rb index a618533d09..671053566d 100644 --- a/actionpack/lib/action_controller/metal/head.rb +++ b/actionpack/lib/action_controller/metal/head.rb @@ -20,6 +20,7 @@ module ActionController options, status = status, nil if status.is_a?(Hash) status ||= options.delete(:status) || :ok location = options.delete(:location) + content_type = options.delete(:content_type) options.each do |key, value| headers[key.to_s.dasherize.split('-').each { |v| v[0] = v[0].chr.upcase }.join('-')] = value.to_s @@ -27,7 +28,7 @@ module ActionController self.status = status self.location = url_for(location) if location - self.content_type = Mime[formats.first] if formats + self.content_type = content_type || (Mime[formats.first] if formats) self.response_body = " " end end |