summaryrefslogtreecommitdiff
path: root/main/php_variables.c
diff options
context:
space:
mode:
authorJoe Watkins <krakjoe@php.net>2019-03-29 08:01:31 +0100
committerJoe Watkins <krakjoe@php.net>2019-03-29 19:06:02 +0100
commit072eb6dd77b079a6f90ca5b155f9b0add1b5f2d4 (patch)
treeb808bffb52c45033bfae2cb09d9dbd0283d0e0cf /main/php_variables.c
parent61ad294f26fa7941a26361a68cf6a01b8a2c3e4f (diff)
downloadphp-git-072eb6dd77b079a6f90ca5b155f9b0add1b5f2d4.tar.gz
tsrm environment lock
Diffstat (limited to 'main/php_variables.c')
-rw-r--r--main/php_variables.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/main/php_variables.c b/main/php_variables.c
index decf73a80f..f5692ede4b 100644
--- a/main/php_variables.c
+++ b/main/php_variables.c
@@ -548,6 +548,8 @@ void _php_import_environment_variables(zval *array_ptr)
zval val;
zend_ulong idx;
+ tsrm_env_lock();
+
for (env = environ; env != NULL && *env != NULL; env++) {
p = strchr(*env, '=');
if (!p
@@ -572,6 +574,8 @@ void _php_import_environment_variables(zval *array_ptr)
php_register_variable_quick(*env, name_len, &val, Z_ARRVAL_P(array_ptr));
}
}
+
+ tsrm_env_unlock();
}
zend_bool php_std_auto_global_callback(char *name, uint32_t name_len)