diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-03-14 13:39:51 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-03-14 13:39:51 -0700 |
| commit | b7b6c22d7807c7f587dcde90ea30f98f17278d1a (patch) | |
| tree | cb94d5f2c7a8e5c83517c6b1481f7192057b14ff /actionpack/lib/action_controller | |
| parent | 36f7732e820ce4d3c4a46bd0a1b15fd8902467b3 (diff) | |
| parent | 2651b597f2491303e143aa063f3f231bf751c382 (diff) | |
| download | rails-b7b6c22d7807c7f587dcde90ea30f98f17278d1a.tar.gz rails-b7b6c22d7807c7f587dcde90ea30f98f17278d1a.tar.bz2 rails-b7b6c22d7807c7f587dcde90ea30f98f17278d1a.zip | |
Merge pull request #9713 from imanel/live_stale
Handle conditional get in live requests
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/live.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb index 9d628c916f..fb664a69dd 100644 --- a/actionpack/lib/action_controller/metal/live.rb +++ b/actionpack/lib/action_controller/metal/live.rb @@ -98,6 +98,10 @@ module ActionController def merge_default_headers(original, default) Header.new self, super end + + def handle_conditional_get! + super unless committed? + end end def process(name) |