From 2651b597f2491303e143aa063f3f231bf751c382 Mon Sep 17 00:00:00 2001 From: Bernard Potocki Date: Thu, 14 Mar 2013 09:13:10 +0100 Subject: Handle conditional get in live requests - this will prevent error when using stale on live streams(issue #9636) --- actionpack/lib/action_controller/metal/live.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'actionpack/lib/action_controller/metal') 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) -- cgit v1.2.3