diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-07-04 06:35:49 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-07-04 06:35:49 +0000 |
| commit | acb1e079806a107b9d5e048260985223028f3612 (patch) | |
| tree | 504275e07af40463c243f42225077f2e52fcc6ce | |
| parent | a32fb32781e81b424ea931fba38af73881ca7b4d (diff) | |
| download | php-git-acb1e079806a107b9d5e048260985223028f3612.tar.gz | |
Changed priority of PHPRC environment variable on win32 to be higher then value from registry.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | main/php_ini.c | 16 |
2 files changed, 10 insertions, 8 deletions
@@ -3,6 +3,8 @@ PHP NEWS ?? ??? 2006, PHP 5.2.0 - Reimplementation of Apache2Filter, PHP can now be an arbitrary filter in the chain and will read the script from the Apache stream. (John) +- Changed priority of PHPRC environment variable on win32 to be higher then + value from registry. (Dmitry) - Changed __toString() to be called wherever applicable. (Marcus) - Changed E_ALL error reporting mode to include E_RECOVERABLE_ERROR. (Marcus) - Changed realpath cache to be disabled when "open_basedir" or "safe_mode" diff --git a/main/php_ini.c b/main/php_ini.c index 05b3bba553..c4abee2b67 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -310,6 +310,14 @@ int php_init_config(TSRMLS_D) free_ini_search_path = 1; php_ini_search_path[0] = 0; + /* Add environment location */ + if (env_location[0]) { + if (*php_ini_search_path) { + strcat(php_ini_search_path, paths_separator); + } + strcat(php_ini_search_path, env_location); + } + #ifdef PHP_WIN32 /* Add registry location */ reg_location = GetIniPathFromRegistry(); @@ -322,14 +330,6 @@ int php_init_config(TSRMLS_D) } #endif - /* Add environment location */ - if (env_location[0]) { - if (*php_ini_search_path) { - strcat(php_ini_search_path, paths_separator); - } - strcat(php_ini_search_path, env_location); - } - /* Add cwd (only with CLI) */ if (strcmp(sapi_module.name, "cli") == 0) { if (*php_ini_search_path) { |