summaryrefslogtreecommitdiff
path: root/hash.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-18 10:30:41 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-07-18 10:30:41 (GMT)
commit4bc16691279e98ecdb3e19ff23902be671d46307 (patch)
tree020365f1dbb98ccbb1dec6ec33f2b36bc26e6d03 /hash.c
parenta22232cd938a1d3df8f940463fb68700de124a19 (diff)
reduce tzset
* time.c (rb_localtime_r): call tzset() only after TZ environment variable is changed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'hash.c')
-rw-r--r--hash.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/hash.c b/hash.c
index c9d60c7..1b3fde2 100644
--- a/hash.c
+++ b/hash.c
@@ -3315,6 +3315,9 @@ env_str_new2(const char *ptr)
static int env_path_tainted(const char *);
+static const char TZ_ENV[] = "TZ";
+extern int ruby_tz_update;
+
static rb_encoding *
env_encoding_for(const char *name, const char *ptr)
{
@@ -3396,6 +3399,9 @@ env_delete(VALUE obj, VALUE name)
RB_GC_GUARD(name);
path_tainted = 0;
}
+ else if (ENVMATCH(nam, TZ_ENV)) {
+ ruby_tz_update = 0;
+ }
return value;
}
return Qnil;
@@ -3755,6 +3761,9 @@ env_aset(VALUE obj, VALUE nm, VALUE val)
path_tainted_p(value);
}
}
+ else if (ENVMATCH(name, TZ_ENV)) {
+ ruby_tz_update = 0;
+ }
return val;
}