diff options
| author | Joe Watkins <krakjoe@php.net> | 2019-03-29 19:06:59 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2019-03-29 19:06:59 +0100 |
| commit | abd0e015a8d126a8efee4b3625b500053ae9827d (patch) | |
| tree | 8c2c90683002c3f7f30fdeacdb779cf71817d960 /sapi | |
| parent | 4006e995772fca4ae2821a0259693901dd229c68 (diff) | |
| parent | 072eb6dd77b079a6f90ca5b155f9b0add1b5f2d4 (diff) | |
| download | php-git-abd0e015a8d126a8efee4b3625b500053ae9827d.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
tsrm environment lock
Diffstat (limited to 'sapi')
| -rw-r--r-- | sapi/litespeed/lsapi_main.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index 64e95d5ceb..2d8eb75326 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -244,6 +244,7 @@ static void litespeed_php_import_environment_variables(zval *array_ptr) return; } + tsrm_env_lock(); for (env = environ; env != NULL && *env != NULL; env++) { p = strchr(*env, '='); if (!p) { /* malformed entry? */ @@ -258,6 +259,7 @@ static void litespeed_php_import_environment_variables(zval *array_ptr) t[nlen] = '\0'; add_variable(t, nlen, p + 1, strlen( p + 1 ), array_ptr); } + tsrm_env_unlock(); if (t != buf && t != NULL) { efree(t); } |