summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/ruby/test_time.rb4
-rw-r--r--time.c1
2 files changed, 5 insertions, 0 deletions
diff --git a/test/ruby/test_time.rb b/test/ruby/test_time.rb
index 7c5ee5466d..2bd4bc8455 100644
--- a/test/ruby/test_time.rb
+++ b/test/ruby/test_time.rb
@@ -556,6 +556,10 @@ class TestTime < Test::Unit::TestCase
def test_zone
assert_zone_encoding Time.now
+ t = Time.now.utc
+ assert_equal("UTC", t.zone)
+ assert_nil(t.getlocal(0).zone)
+ assert_nil(t.getlocal("+02:00").zone)
end
def test_plus_minus_succ
diff --git a/time.c b/time.c
index abe64c7170..3bbfce6b38 100644
--- a/time.c
+++ b/time.c
@@ -1896,6 +1896,7 @@ time_set_utc_offset(VALUE time, VALUE off)
GetTimeval(time, tobj);
tobj->tm_got = 0;
+ tobj->vtm.zone = Qnil;
TZMODE_SET_FIXOFF(tobj, off);
return time;