diff options
author | Jamis Buck <jamis@37signals.com> | 2008-08-19 16:07:17 -0600 |
---|---|---|
committer | Jamis Buck <jamis@37signals.com> | 2008-08-19 16:07:17 -0600 |
commit | 6e4ea66dc0d41ef611e2b2187e940321f5dc748a (patch) | |
tree | e84e78c3b35c34876e6e83adfcffe9c32caa0db5 /actionpack | |
parent | bd7edcf286421b090b8de5674422a7316ed043a9 (diff) | |
download | rails-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')
-rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
-rw-r--r-- | actionpack/lib/action_controller/request.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 6f65d4003d..db3378d9d9 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *Edge* +* Made AbstractRequest.if_modified_sense return nil if the header could not be parsed [Jamis Buck] + * Added back ActionController::Base.allow_concurrency flag [Josh Peek] * AbstractRequest.relative_url_root is no longer automatically configured by a HTTP header. It can now be set in your configuration environment with config.action_controller.relative_url_root [Josh Peek] 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 |