diff options
| author | Johan Sørensen <johan@johansorensen.com> | 2009-03-06 10:17:20 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-07 12:18:10 +0000 |
| commit | c071123b3e2d6fd918dd7e419efe7429355445c2 (patch) | |
| tree | f8156ec917b02b0c803d77f2c0954d9b3192161a /actionpack/lib/action_controller/base.rb | |
| parent | fd3ccbe955ed58298df43f537a01358d15d8d4cf (diff) | |
| download | rails-c071123b3e2d6fd918dd7e419efe7429355445c2.tar.gz rails-c071123b3e2d6fd918dd7e419efe7429355445c2.tar.bz2 rails-c071123b3e2d6fd918dd7e419efe7429355445c2.zip | |
Ensure expires_in without a :public key sets the Cache-Control header to private. [#2095 state:resolved]
This fixes a regression introduced in f2a32bd0, which wasn't exposed due to two
test methods having the same name.
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 5da47ce317..9d06d052b4 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1205,10 +1205,12 @@ module ActionController #:nodoc: cache_control = response.headers["Cache-Control"].split(",").map {|k| k.strip } cache_control << "max-age=#{seconds}" + cache_control.delete("no-cache") if options[:public] cache_control.delete("private") - cache_control.delete("no-cache") cache_control << "public" + else + cache_control << "private" end # This allows for additional headers to be passed through like 'max-stale' => 5.hours |