SOURCES: php4-ini-search-path.patch (NEW) - avoid reading php.ini ...

[glen]

Author: glen                         Date: Tue Jan 17 22:59:54 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- avoid reading php.ini from arbitary locations (./, ./php4.cli/php.ini)

---- Files affected:
SOURCES:
   php4-ini-search-path.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/php4-ini-search-path.patch
diff -u /dev/null SOURCES/php4-ini-search-path.patch:1.1
--- /dev/null	Tue Jan 17 23:59:54 2006
+++ SOURCES/php4-ini-search-path.patch	Tue Jan 17 23:59:49 2006
@@ -0,0 +1,36 @@
+see also http://bugs.php.net/bug.php?id=34793
+--- php-4.4.2/main/php_ini.c~	2006-01-17 19:02:09.000000000 +0200
++++ php-4.4.2/main/php_ini.c	2006-01-17 19:26:46.000000000 +0200
+@@ -19,7 +19,7 @@
+ /* $Id$ */
+ 
+ /* Check CWD for php.ini */
+-#define INI_CHECK_CWD
++#undef	INI_CHECK_CWD
+ 
+ #include "php.h"
+ #include "ext/standard/info.h"
+@@ -328,13 +327,13 @@
+ 			efree(binary_location);
+ 			binary_location = NULL;
+ 		}
+-#else
++
+ 		if (sapi_module.executable_location) {
+ 			binary_location = estrdup(sapi_module.executable_location);
+ 		} else {
+ 			binary_location = NULL;
+ 		}
+-#endif
++
+ 		if (binary_location) {
+ 			char *separator_location = strrchr(binary_location, DEFAULT_SLASH);
+ 			
+@@ -349,7 +348,6 @@
+ 		}
+ 
+ 		/* Add default location */
+-#ifdef PHP_WIN32
+ 		default_location = (char *) emalloc(MAXPATHLEN + 1);
+ 	
+ 		if (0 < GetWindowsDirectory(default_location, MAXPATHLEN)) {
================================================================