summaryrefslogtreecommitdiff
path: root/main/configuration-parser.y
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>1999-04-21 17:28:54 +0000
committerZeev Suraski <zeev@php.net>1999-04-21 17:28:54 +0000
commit7aad23132703ae2ab35b9faf1bc955af8376e03e (patch)
tree812302a2cff847519b05a468d3f811ce6c68e449 /main/configuration-parser.y
parenta9f9ae792030e99b6552ff9090cc8e808d148fc1 (diff)
downloadphp-git-7aad23132703ae2ab35b9faf1bc955af8376e03e.tar.gz
Thread safety patch. It works now with just-in-time resource initialization!
Diffstat (limited to 'main/configuration-parser.y')
-rw-r--r--main/configuration-parser.y3
1 files changed, 3 insertions, 0 deletions
diff --git a/main/configuration-parser.y b/main/configuration-parser.y
index f89987b63b..b54079d6e0 100644
--- a/main/configuration-parser.y
+++ b/main/configuration-parser.y
@@ -167,6 +167,7 @@ int php3_init_config(void)
{
char *env_location,*default_location,*php_ini_path;
int safe_mode_state = PG(safe_mode);
+ char *open_basedir = PG(open_basedir);
char *opened_path;
int free_default_location=0;
@@ -209,12 +210,14 @@ int php3_init_config(void)
strcpy(php_ini_path,default_location);
}
PG(safe_mode) = 0;
+ PG(open_basedir) = NULL;
cfgin = php3_fopen_with_path("php3.ini","r",php_ini_path,&opened_path);
free(php_ini_path);
if (free_default_location) {
free(default_location);
}
PG(safe_mode) = safe_mode_state;
+ PG(open_basedir) = open_basedir;
if (!cfgin) {
# if WIN32|WINNT