dmitry Tue Jul 4 06:35:49 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/main php_ini.c
Log:
Changed priority of PHPRC environment variable on win32 to be higher then
value from registry.
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.103&r2=1.2027.2.547.2.104&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.103 php-src/NEWS:1.2027.2.547.2.104
--- php-src/NEWS:1.2027.2.547.2.103 Mon Jul 3 16:55:57 2006
+++ php-src/NEWS Tue Jul 4 06:35:49 2006
@@ -3,6 +3,8 @@
?? ??? 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"
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4&r2=1.136.2.4.2.1&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.4 php-src/main/php_ini.c:1.136.2.4.2.1
--- php-src/main/php_ini.c:1.136.2.4 Sun Jan 1 12:50:17 2006
+++ php-src/main/php_ini.c Tue Jul 4 06:35:49 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.136.2.4 2006/01/01 12:50:17 sniper Exp $ */
+/* $Id: php_ini.c,v 1.136.2.4.2.1 2006/07/04 06:35:49 dmitry Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -310,6 +310,14 @@
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 @@
}
#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) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
