Skip to content

strftime.c: support unknown offset UTC in RFC 3339 [Feature #17544] #4075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 16, 2021
Merged

strftime.c: support unknown offset UTC in RFC 3339 [Feature #17544] #4075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab8ad25
strftime.c: support unknown offset UTC in RFC 3339 [Feature #17544]
nobu Jan 15, 2021
8999b73
UTC zone should be still "+00:00" [Feature #17544]
nobu Feb 16, 2021
9ce93db
Parse "-00:00" as UTC for the round-trip [Feature #17544]
nobu Feb 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion strftime.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,7 +547,7 @@ rb_strftime_with_timespec(VALUE ftime, const char *format, size_t format_len,
else {
off = NUM2LONG(rb_funcall(vtm->utc_offset, rb_intern("round"), 0));
}
if (off < 0) {
if (off < 0 || (gmt && (flags & BIT_OF(LEFT)))) {
off = -off;
sign = -1;
}
Expand Down
11 changes: 11 additions & 0 deletions test/ruby/test_time.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -920,6 +920,17 @@ def test_strfimte_zoneoffset
assert_equal("+09:00", t.strftime("%:z"))
assert_equal("+09:00:01", t.strftime("%::z"))
assert_equal("+09:00:01", t.strftime("%:::z"))

assert_equal("+0000", t2000.strftime("%z"))
assert_equal("-0000", t2000.strftime("%-z"))
assert_equal("-00:00", t2000.strftime("%-:z"))
assert_equal("-00:00:00", t2000.strftime("%-::z"))

t = t2000.getlocal("+00:00")
assert_equal("+0000", t.strftime("%z"))
assert_equal("+0000", t.strftime("%-z"))
assert_equal("+00:00", t.strftime("%-:z"))
assert_equal("+00:00:00", t.strftime("%-::z"))
end

def test_strftime_padding
Expand Down
2 changes: 2 additions & 0 deletions test/ruby/test_time_tz.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,8 @@ def test_utc_names
assert_predicate(Time.new(2019, 1, 1, 0, 0, 0, "UTC"), :utc?)
assert_predicate(Time.new(2019, 1, 1, 0, 0, 0, "utc"), :utc?)
assert_predicate(Time.new(2019, 1, 1, 0, 0, 0, "Z"), :utc?)
assert_predicate(Time.new(2019, 1, 1, 0, 0, 0, "-00:00"), :utc?)
assert_not_predicate(Time.new(2019, 1, 1, 0, 0, 0, "+00:00"), :utc?)
end

def test_military_names
Expand Down
4 changes: 3 additions & 1 deletion time.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2150,8 +2150,10 @@ utc_offset_arg(VALUE arg)
if (s[0] != '+' && s[0] != '-') goto invalid_utc_offset;
if (!ISDIGIT(s[1]) || !ISDIGIT(s[2])) goto invalid_utc_offset;
n += (s[1] * 10 + s[2] - '0' * 11) * 3600;
if (s[0] == '-')
if (s[0] == '-') {
if (n == 0) return UTC_ZONE;
n = -n;
}
return INT2FIX(n);
}
else {
Expand Down