aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Toomey <ptoomey3@biasedcoin.com>2017-08-23 11:47:34 -0600
committerPatrick Toomey <ptoomey3@biasedcoin.com>2017-08-23 11:47:34 -0600
commit651ec51fc5b3d044083d301e571ff108ab02d62f (patch)
treebf86ab7e87a7b9c27f1f0b84a2adc2d38f2d8894
parent94b602055b0d6e2e1a9f6d33b49b433260f5e656 (diff)
downloadrails-651ec51fc5b3d044083d301e571ff108ab02d62f.tar.gz
rails-651ec51fc5b3d044083d301e571ff108ab02d62f.tar.bz2
rails-651ec51fc5b3d044083d301e571ff108ab02d62f.zip
Don't touch an unused header
The prior logic explictly set `Cache-Control` to `nil`. But, we would only reach that logic if the header was not set to begin with. So, rather than give it any value at all, just leave it alone.
-rw-r--r--actionpack/lib/action_dispatch/http/cache.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/cache.rb b/actionpack/lib/action_dispatch/http/cache.rb
index 2107b4d224..ba39091119 100644
--- a/actionpack/lib/action_dispatch/http/cache.rb
+++ b/actionpack/lib/action_dispatch/http/cache.rb
@@ -196,7 +196,6 @@ module ActionDispatch
if control.empty?
# Let middleware handle default behavior
- self._cache_control = nil
elsif control[:no_cache]
self._cache_control = NO_CACHE
if control[:extras]