summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--ext/date/date_parse.c2
-rw-r--r--test/date/test_date_parse.rb9
-rw-r--r--version.h2
4 files changed, 15 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9d944413db..0cc0dcb080 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jul 13 23:41:25 2013 Tadayoshi Funaba <tadf@dotrb.org>
+
+ * ext/date/date_parse.c (date_zone_to_diff): [ruby-core:55831].
+
Sat Jul 13 23:34:13 2013 Akinori MUSHA <knu@iDaemons.org>
* object.c: Fix rdoc for Kernel#<=>. [Fix GH-352]
diff --git a/ext/date/date_parse.c b/ext/date/date_parse.c
index 815c07f483..765f9a7292 100644
--- a/ext/date/date_parse.c
+++ b/ext/date/date_parse.c
@@ -569,7 +569,7 @@ date_zone_to_diff(VALUE str)
if (cl >= 3)
min = rb_str_new(&cs[1], 2);
if (cl >= 5)
- min = rb_str_new(&cs[3], 2);
+ sec = rb_str_new(&cs[3], 2);
}
else {
if (cl >= 2)
diff --git a/test/date/test_date_parse.rb b/test/date/test_date_parse.rb
index 9e958abaa0..a3ade3f86b 100644
--- a/test/date/test_date_parse.rb
+++ b/test/date/test_date_parse.rb
@@ -578,6 +578,15 @@ class TestDateParse < Test::Unit::TestCase
assert_equal(d2, d1)
end
+ def test__parse_odd_offset
+ h = DateTime._parse('2001-02-03T04:05:06+1')
+ assert_equal(3600, h[:offset])
+ h = DateTime._parse('2001-02-03T04:05:06+123')
+ assert_equal(4980, h[:offset])
+ h = DateTime._parse('2001-02-03T04:05:06+12345')
+ assert_equal(5025, h[:offset])
+ end
+
require 'time'
def test_parse__time
diff --git a/version.h b/version.h
index 6259514b4e..8f779d505b 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-07-13"
-#define RUBY_PATCHLEVEL 264
+#define RUBY_PATCHLEVEL 265
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 7