diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2016-03-05 16:52:48 -0300 |
---|---|---|
committer | Rafael França <rafaelmfranca@gmail.com> | 2016-03-05 16:52:48 -0300 |
commit | 2fcd57b066e54f86470648cb13df5d0547b4f24a (patch) | |
tree | b1f5d09945491701f3ffaad80df3ec74223676d8 | |
parent | df890780f8461eb504d2607594ea47e68d0e0b2d (diff) | |
parent | 3d6c124dc1e2911b45c23596e9f0e1d2d7ee615f (diff) | |
download | rails-2fcd57b066e54f86470648cb13df5d0547b4f24a.tar.gz rails-2fcd57b066e54f86470648cb13df5d0547b4f24a.tar.bz2 rails-2fcd57b066e54f86470648cb13df5d0547b4f24a.zip |
Merge pull request #24072 from byroot/remove-http-cache-forever-version
Remove http_cache_forever's version parameter
-rw-r--r-- | actionpack/lib/action_controller/metal/conditional_get.rb | 6 | ||||
-rw-r--r-- | actionpack/test/controller/render_test.rb | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb index e2535d024c..35befc05e1 100644 --- a/actionpack/lib/action_controller/metal/conditional_get.rb +++ b/actionpack/lib/action_controller/metal/conditional_get.rb @@ -222,12 +222,10 @@ module ActionController # * +public+: By default, HTTP responses are private, cached only on the # user's web browser. To allow proxies to cache the response, set +true+ to # indicate that they can serve the cached response to all users. - # - # * +version+: the version passed as a key for the cache. - def http_cache_forever(public: false, version: 'v1') + def http_cache_forever(public: false) expires_in 100.years, public: public - yield if stale?(etag: "#{version}-#{request.fullpath}", + yield if stale?(etag: request.fullpath, last_modified: Time.new(2011, 1, 1).utc, public: public) end diff --git a/actionpack/test/controller/render_test.rb b/actionpack/test/controller/render_test.rb index b7f3e121fd..82fc8b0f8a 100644 --- a/actionpack/test/controller/render_test.rb +++ b/actionpack/test/controller/render_test.rb @@ -703,7 +703,7 @@ end class HttpCacheForeverTest < ActionController::TestCase class HttpCacheForeverController < ActionController::Base def cache_me_forever - http_cache_forever(public: params[:public], version: params[:version] || 'v1') do + http_cache_forever(public: params[:public]) do render plain: 'hello' end end @@ -742,13 +742,5 @@ class HttpCacheForeverTest < ActionController::TestCase assert_response :not_modified @request.if_modified_since = @response.headers['Last-Modified'] @request.if_none_match = @response.etag - - get :cache_me_forever, params: {version: 'v2'} - assert_response :success - @request.if_modified_since = @response.headers['Last-Modified'] - @request.if_none_match = @response.etag - - get :cache_me_forever, params: {version: 'v2'} - assert_response :not_modified end end |