cvs: php-src /main php_ini.c

From: Date: Tue, 04 Jul 2006 06:38:32 +0000
Subject: cvs: php-src /main php_ini.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-39030@lists.php.net to get a copy of this message
dmitry Tue Jul 4 06:38:32 2006 UTC Modified files: /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/main/php_ini.c?r1=1.142&r2=1.143&diff_format=u Index: php-src/main/php_ini.c diff -u php-src/main/php_ini.c:1.142 php-src/main/php_ini.c:1.143 --- php-src/main/php_ini.c:1.142 Wed Mar 8 14:41:45 2006 +++ php-src/main/php_ini.c Tue Jul 4 06:38:32 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ini.c,v 1.142 2006/03/08 14:41:45 iliaa Exp $ */ +/* $Id: php_ini.c,v 1.143 2006/07/04 06:38:32 dmitry Exp $ */ #include "php.h" #include "ext/standard/info.h" @@ -308,6 +308,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(); @@ -320,14 +328,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) {

« previous php.cvs (#39030) next »