Removed CWD from php_ini_search_path when using CLI SAPI.

php · Feb 28, 2002 · ab25640 · ab25640
1 parent 83059ae
commit ab25640
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/main/php_ini.c b/main/php_ini.c
@@ -27,6 +27,7 @@
 #include "ext/standard/dl.h"
 #include "zend_extensions.h"
 #include "zend_highlight.h"
+#include "SAPI.h"
 
 typedef struct _php_extension_lists {
 	zend_llist engine;
@@ -239,10 +240,18 @@ int php_init_config(char *php_ini_path_override)
 #endif
 		php_ini_search_path = (char *) emalloc(sizeof(".")+strlen(env_location)+strlen(default_location)+2+1);
 		free_ini_search_path = 1;
-		if(env_location && env_location[0]) {
+		if (strcmp(sapi_module.name, "cli")==0) {
-			sprintf(php_ini_search_path, ".%c%s%c%s", ZEND_PATHS_SEPARATOR, env_location, ZEND_PATHS_SEPARATOR, default_location);
+			if(env_location && env_location[0]) {
+				sprintf(php_ini_search_path, "%s%c%s", env_location, ZEND_PATHS_SEPARATOR, default_location);
+			} else {
+				sprintf(php_ini_search_path, "%s", default_location);
+			}
 		} else {
-			sprintf(php_ini_search_path, ".%c%s", ZEND_PATHS_SEPARATOR, default_location);
+			if(env_location && env_location[0]) {
+				sprintf(php_ini_search_path, ".%c%s%c%s", ZEND_PATHS_SEPARATOR, env_location, ZEND_PATHS_SEPARATOR, default_location);
+			} else {
+				sprintf(php_ini_search_path, ".%c%s", ZEND_PATHS_SEPARATOR, default_location);
+			}
 		}
 		if (free_default_location) {
 			efree(default_location);