diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-06-27 23:42:13 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-06-28 14:46:22 -0700 |
| commit | ec18719b81e117215fefb33aff5ed43472bce048 (patch) | |
| tree | 231caa408d2a0ac693eb0b21e99318547ef25b5b /actionpack/lib/action_dispatch/http/cache.rb | |
| parent | b2633f9f9323f5d5eca1c2c94bb7ae88ad276cda (diff) | |
| download | rails-ec18719b81e117215fefb33aff5ed43472bce048.tar.gz rails-ec18719b81e117215fefb33aff5ed43472bce048.tar.bz2 rails-ec18719b81e117215fefb33aff5ed43472bce048.zip | |
ETag: use body instead of @body since the method will always return a string
Diffstat (limited to 'actionpack/lib/action_dispatch/http/cache.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/cache.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/cache.rb b/actionpack/lib/action_dispatch/http/cache.rb index 9b9e81440b..e9fdf75cc8 100644 --- a/actionpack/lib/action_dispatch/http/cache.rb +++ b/actionpack/lib/action_dispatch/http/cache.rb @@ -89,7 +89,7 @@ module ActionDispatch if etag? || last_modified? || !@cache_control.empty? set_conditional_cache_control! elsif nonempty_ok_response? - self.etag = @body + self.etag = body if request && request.etag_matches?(etag) self.status = 304 @@ -137,4 +137,4 @@ module ActionDispatch end end end -end
\ No newline at end of file +end |