From 9f86a43648d77414bc8509f03720a2aed334f62d Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 31 Jul 2018 14:12:08 +0000 Subject: merge revision(s) 63512,63514: [Backport #14790] time.rb: fix parsing time zone in iso8601 * lib/time.rb (Time.xmlschema): a colon in time zone designator can be omitted. [ruby-core:87277] [Bug #14790] time.rb: fix parsing time zone in iso8601 * lib/time.rb (Time.xmlschema): the minute in time zone designator can be omitted together with the preceding colon. [ruby-core:87277] [Bug #14790] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@64148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/time.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/time.rb b/lib/time.rb index 5179e9fee4..0af919b9b8 100644 --- a/lib/time.rb +++ b/lib/time.rb @@ -575,7 +575,7 @@ class Time T (\d\d):(\d\d):(\d\d) (\.\d+)? - (Z|[+-]\d\d:\d\d)? + (Z|[+-]\d\d(?::?\d\d)?)? \s*\z/ix =~ date year = $1.to_i mon = $2.to_i -- cgit v1.2.3