shane Sat Mar 22 13:54:56 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/main php_ini.c
Log:
MFH
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.106.2.7 php4/main/php_ini.c:1.106.2.8
--- php4/main/php_ini.c:1.106.2.7 Fri Feb 28 15:44:47 2003
+++ php4/main/php_ini.c Sat Mar 22 13:54:56 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.106.2.7 2003/02/28 20:44:47 rasmus Exp $ */
+/* $Id: php_ini.c,v 1.106.2.8 2003/03/22 18:54:56 shane Exp $ */
/* Check CWD for php.ini */
#define INI_CHECK_CWD
@@ -273,6 +273,14 @@
* Prepare search path
*/
+ /* 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 */
#ifdef INI_CHECK_CWD
if (strcmp(sapi_module.name, "cli")!=0) {
@@ -308,14 +316,6 @@
}
strcat(php_ini_search_path, binary_location);
efree(binary_location);
- }
-
- /* 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 default location */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
