cf14dc2f78
- SECURITY fixes: CVE-2012-0057 CVE-2011-4566 CVE-2012-0788 CVE-2012-0789 - sync WANTLIB for php-5.2 while there ok robert@
13 lines
613 B
Plaintext
13 lines
613 B
Plaintext
$OpenBSD: patch-main_php_ini_c,v 1.3 2012/01/21 23:34:35 sthen Exp $
|
|
--- main/php_ini.c.orig.port Sun Jan 1 13:15:04 2012
|
|
+++ main/php_ini.c Wed Jan 18 14:03:17 2012
|
|
@@ -599,7 +599,7 @@ int php_init_config(TSRMLS_D)
|
|
|
|
/* If still no ini file found, search for php.ini file in search path */
|
|
if (!fh.handle.fp) {
|
|
- fh.handle.fp = php_fopen_with_path("php.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
|
|
+ fh.handle.fp = php_fopen_with_path("php-${PV}.ini", "r", php_ini_search_path, &php_ini_opened_path TSRMLS_CC);
|
|
if (fh.handle.fp) {
|
|
fh.filename = php_ini_opened_path;
|
|
}
|