handle y2k38 bug

dwaite · Aug 29, 2010 · f29fd1c · f29fd1c
1 parent 7fcc600
commit f29fd1c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/lib/cookiejar/cookie_validation.rb b/lib/cookiejar/cookie_validation.rb
@@ -308,7 +308,12 @@ def self.parse_set_cookie set_cookie_value
         else
           case key
           when :expires
-            args[:expires_at] = Time.parse keyvalue
+            begin
+              args[:expires_at] = Time.parse keyvalue 
+            rescue ArgumentError
+              raise unless $!.message == "time out of range"
+              args[:expires_at] = Time.at(0x7FFFFFFF)
+            end 
           when *[:domain, :path]
             args[key] = keyvalue
           when :secure

diff --git a/test/cookie_validation_test.rb b/test/cookie_validation_test.rb
@@ -236,4 +236,9 @@
       end
     end
   end
+  describe '#parse_set_cookie' do
+    it "should max out at 2038 on 32bit systems" do
+      CookieValidation.parse_set_cookie("TRACK_USER_P=98237480810003948000782774;expires=Sat, 30-Jun-2040 05:39:49 GMT;path=/")[:expires_at].to_i.should >= 0x7FFFFFFF
+    end
+  end  
 end