Changed priority of PHPRC environment variable on win32 to be higher then value from...

diff --git a/NEWS b/NEWS
index afead01e300107301757f0b85dd220bca92a4488..dbb8f335ca6f583a911cd7c91618a81edaf6f049 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 05b3bba5539fb89272d79ac98efc7500c3009263..c4abee2b671e5a5f3c2bde229ceb358858104acf 100644 (file)
--- 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) {