Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

ETag: use body instead of @body since the method will always return a…

… string
  • Loading branch information...
commit ec18719b81e117215fefb33aff5ed43472bce048 1 parent b2633f9
@jeremy jeremy authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionpack/lib/action_dispatch/http/cache.rb
View
4 actionpack/lib/action_dispatch/http/cache.rb
@@ -89,7 +89,7 @@ def handle_conditional_get!
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 @@ def set_conditional_cache_control!
end
end
end
-end
+end
Please sign in to comment.
Something went wrong with that request. Please try again.