diff options
| author | Edin Kadribasic <edink@php.net> | 2002-02-28 12:12:39 +0000 |
|---|---|---|
| committer | Edin Kadribasic <edink@php.net> | 2002-02-28 12:12:39 +0000 |
| commit | ab2564053f3b0187f2fe93a58be24b69b1dac797 (patch) | |
| tree | 2ff5514ab8e1dc260e3af657574b0433c91bac43 /main/php_ini.c | |
| parent | 83059ae3defbdd4dcb5c68e20952f1ccdbef2715 (diff) | |
| download | php-git-ab2564053f3b0187f2fe93a58be24b69b1dac797.tar.gz | |
Removed CWD from php_ini_search_path when using CLI SAPI.
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 55d2f4ad2e..975cf0b9a2 100644 --- 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]) { - sprintf(php_ini_search_path, ".%c%s%c%s", ZEND_PATHS_SEPARATOR, env_location, ZEND_PATHS_SEPARATOR, default_location); + if (strcmp(sapi_module.name, "cli")==0) { + 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); |