diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-08-14 16:31:14 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-08-14 16:31:14 +0100 |
| commit | 2ebe8d275efa53af967b09ad66dab68acc1aed98 (patch) | |
| tree | b0b3e42c277b213788b55558aef3579f4e242300 /actionpack/CHANGELOG | |
| parent | 73ef94e9675ef6db85f18f1e3c70bf6ddfc1260a (diff) | |
| parent | 8cb14ee1203c9ed380c4b192e8730757a52d43cb (diff) | |
| download | rails-2ebe8d275efa53af967b09ad66dab68acc1aed98.tar.gz rails-2ebe8d275efa53af967b09ad66dab68acc1aed98.tar.bz2 rails-2ebe8d275efa53af967b09ad66dab68acc1aed98.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionpack/lib/action_controller/request.rb
actionpack/lib/action_controller/resources.rb
Diffstat (limited to 'actionpack/CHANGELOG')
| -rw-r--r-- | actionpack/CHANGELOG | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 177c6a354e..6f65d4003d 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -7,8 +7,14 @@ * Update Prototype to 1.6.0.2 #599 [Patrick Joyce] * Conditional GET utility methods. [Jeremy Kemper] - * etag!([:admin, post, current_user]) sets the ETag response header and returns head(:not_modified) if it matches the If-None-Match request header. - * last_modified!(post.updated_at) sets Last-Modified and returns head(:not_modified) if it's no later than If-Modified-Since. + response.last_modified = @post.updated_at + response.etag = [:admin, @post, current_user] + + if request.fresh?(response) + head :not_modified + else + # render ... + end * All 2xx requests are considered successful [Josh Peek] |