edink Tue Sep 5 11:54:15 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/main php_ini.c
Log:
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.
http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4.2.2&r2=1.136.2.4.2.3&diff_format=u
Index: php-src/main/php_ini.c
diff -u php-src/main/php_ini.c:1.136.2.4.2.2
php-src/main/php_ini.c:1.136.2.4.2.3
--- php-src/main/php_ini.c:1.136.2.4.2.2 Thu Aug 3 11:04:52 2006
+++ php-src/main/php_ini.c Tue Sep 5 11:54:15 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ini.c,v 1.136.2.4.2.2 2006/08/03 11:04:52 dmitry Exp $ */
+/* $Id: php_ini.c,v 1.136.2.4.2.3 2006/09/05 11:54:15 edink Exp $ */
#include "php.h"
#include "ext/standard/info.h"
@@ -333,8 +333,8 @@
}
#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);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
