diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-13 14:47:56 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-07-13 14:47:56 +0000 |
commit | ad22d67e2b3f35c540c6794cb343024bca694544 (patch) | |
tree | 884e52efe341d8c44fea6385d64f971db410405e | |
parent | 34b1d25015b98a5d000a61dac9d495c8c834c1a2 (diff) |
merge revision(s) 41871: [Backport #8608]
* ext/date/date_parse.c (date_zone_to_diff): [ruby-core:55831].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@41951 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ext/date/date_parse.c | 2 | ||||
-rw-r--r-- | test/date/test_date_parse.rb | 9 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 15 insertions, 2 deletions
@@ -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 @@ -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 |