tadf	2012-08-22 19:42:15 +0900 (Wed, 22 Aug 2012)

  New Revision: 36782

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36782

  Log:
    * ext/date/date_core.c: [ruby-core:47226].

  Modified files:
    trunk/ChangeLog
    trunk/ext/date/date_core.c
    trunk/test/date/test_date_parse.rb
    trunk/test/date/test_date_strptime.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36781)
+++ ChangeLog	(revision 36782)
@@ -1,3 +1,7 @@
+Wed Aug 22 19:41:19 2012  Tadayoshi Funaba  <tadf@d...>
+
+	* ext/date/date_core.c: [ruby-core:47226].
+
 Wed Aug 22 16:57:04 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/mkmf.rb (configuration): extact least ruby headers list as
Index: ext/date/date_core.c
===================================================================
--- ext/date/date_core.c	(revision 36781)
+++ ext/date/date_core.c	(revision 36782)
@@ -7976,7 +7976,7 @@
 	    set_hash("min", INT2FIX(0));
 	if (NIL_P(ref_hash("sec")))
 	    set_hash("sec", INT2FIX(0));
-	else if (f_gt_p(ref_hash("sec"), INT2FIX(59)))
+	else if (f_eqeq_p(ref_hash("sec"), INT2FIX(60)))
 	    set_hash("sec", INT2FIX(59));
     }
     else {
Index: test/date/test_date_strptime.rb
===================================================================
--- test/date/test_date_strptime.rb	(revision 36781)
+++ test/date/test_date_strptime.rb	(revision 36782)
@@ -467,7 +467,13 @@
     assert_raise(ArgumentError) do
       DateTime.strptime('2001-02-29T23:59:60', '%FT%T')
     end
+    assert_nothing_raised(ArgumentError) do
+      DateTime.strptime('2001-03-01T23:59:60', '%FT%T')
+    end
     assert_raise(ArgumentError) do
+      DateTime.strptime('2001-03-01T23:59:61', '%FT%T')
+    end
+    assert_raise(ArgumentError) do
       Date.strptime('23:55', '%H:%M')
     end
     assert_raise(ArgumentError) do
Index: test/date/test_date_parse.rb
===================================================================
--- test/date/test_date_parse.rb	(revision 36781)
+++ test/date/test_date_parse.rb	(revision 36782)
@@ -664,7 +664,13 @@
     assert_raise(ArgumentError) do
       DateTime.parse('2001-02-29T23:59:60')
     end
+    assert_nothing_raised(ArgumentError) do
+      DateTime.parse('2001-03-01T23:59:60')
+    end
     assert_raise(ArgumentError) do
+      DateTime.parse('2001-03-01T23:59:61')
+    end
+    assert_raise(ArgumentError) do
       Date.parse('23:55')
     end
   end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/