shane Sat Mar 22 13:54:35 2003 EDT
Modified files:
/php4/main php_ini.c
Log:
Fix PHPRC overriding other ini files. This is how PHPRC worked prior to
4.3.x, and is usefull for applications that execute PHP and want to
emulate CGI and define alternate INI files (ie. cannot use -c).
Index: php4/main/php_ini.c
diff -u php4/main/php_ini.c:1.118 php4/main/php_ini.c:1.119
--- php4/main/php_ini.c:1.118 Tue Mar 18 10:53:33 2003
+++ php4/main/php_ini.c Sat Mar 22 13:54:35 2003
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.118 2003/03/18 15:53:33 helly Exp $ */
+/* $Id: php_ini.c,v 1.119 2003/03/22 18:54:35 shane Exp $ */
/* Check CWD for php.ini */
#define INI_CHECK_CWD
@@ -306,6 +306,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) {
@@ -341,14 +349,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
