aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/request.rb
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2008-08-19 16:07:17 -0600
committerJamis Buck <jamis@37signals.com>2008-08-19 16:07:17 -0600
commit6e4ea66dc0d41ef611e2b2187e940321f5dc748a (patch)
treee84e78c3b35c34876e6e83adfcffe9c32caa0db5 /actionpack/lib/action_controller/request.rb
parentbd7edcf286421b090b8de5674422a7316ed043a9 (diff)
downloadrails-6e4ea66dc0d41ef611e2b2187e940321f5dc748a.tar.gz
rails-6e4ea66dc0d41ef611e2b2187e940321f5dc748a.tar.bz2
rails-6e4ea66dc0d41ef611e2b2187e940321f5dc748a.zip
Make AbstractRequest.if_modified_sense return nil if the header could not be parsed
Diffstat (limited to 'actionpack/lib/action_controller/request.rb')
-rw-r--r--actionpack/lib/action_controller/request.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index 90bced14e6..364e6201cc 100644
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -100,7 +100,7 @@ module ActionController
def if_modified_since
if since = env['HTTP_IF_MODIFIED_SINCE']
- Time.rfc2822(since)
+ Time.rfc2822(since) rescue nil
end
end
memoize :if_modified_since