diff --git a/ChangeLog b/ChangeLog index f0d783b0c9..d6c0625a54 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun May 4 03:46:42 2014 Tanaka Akira + + * lib/time.rb (Time.httpdate): Always return a UTC Time object. + Sun May 4 03:26:39 2014 Tanaka Akira * lib/time.rb (Time.make_time): Refactored. diff --git a/lib/time.rb b/lib/time.rb index 9d4e9cccba..3b928a205f 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -488,7 +488,7 @@ class Time (\d{2}):(\d{2}):(\d{2})\x20 GMT \s*\z/ix =~ date - self.rfc2822(date) + self.rfc2822(date).utc elsif /\A\s* (?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday),\x20 (\d\d)-(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)-(\d\d)\x20