diff options
| author | Edin Kadribasic <edink@php.net> | 2006-09-05 11:54:15 +0000 |
|---|---|---|
| committer | Edin Kadribasic <edink@php.net> | 2006-09-05 11:54:15 +0000 |
| commit | ef058cdd9a08c98d0d40ed0f987eec8bc2be9308 (patch) | |
| tree | f9f08f670e774cb23acba9f32ae1306f2252424d | |
| parent | 8c53ff1e801a8127b24a4bd551613a3f4bd4bc8d (diff) | |
| download | php-git-ef058cdd9a08c98d0d40ed0f987eec8bc2be9308.tar.gz | |
Search for php.ini in CWD in all sapi's *but* CLI.
This patch reverses wrong behavaiour introduced before the
release of 5.1.0.
# We should probably consider killing adding CWD php.ini lookup
# altogether.
| -rw-r--r-- | main/php_ini.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 25fbe0f487..92f2a4dda0 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -333,8 +333,8 @@ int php_init_config(TSRMLS_D) } #endif - /* Add cwd (only with CLI) */ - if (strcmp(sapi_module.name, "cli") == 0) { + /* Add cwd (not with CLI) */ + if (strcmp(sapi_module.name, "cli") != 0) { if (*php_ini_search_path) { strcat(php_ini_search_path, paths_separator); } |