mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Make AbstractRequest.if_modified_sense return nil if the header could not be parsed
This commit is contained in:
parent
bd7edcf286
commit
6e4ea66dc0
2 changed files with 3 additions and 1 deletions
|
@ -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]
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue