File php-5.4.x-ea4-ini.patch of Package scl-php54

Overview Repositories Revisions Requests Users Attributes Meta

File php-5.4.x-ea4-ini.patch of Package scl-php54 (Revision 14d92579e7c9a23d4d8528be177f4b98)

Currently displaying revision 14d92579e7c9a23d4d8528be177f4b98 , Show latest

From: Jacob Perkins <jacob.perkins@cpanel.net>
Date: Mon, 13 Jun 2016 18:28:36 -0500
Subject: [PATCH] Ensure that php.d is not scanned when PHPRC is set

Since EasyApache 4 is built with the configuration
option 'with-config-file-scan-dir', this ensured that php.d was
read, allowing module configurations to be loaded. It resulted
in customer configurations not being overridden with any 
situations where PHPRC is used (primarily suPHP). This patch
provides EasyApache 3 compatible behaviors when using 
suPHP_ConfigPath, specifically by not scanning php.d when
PHPRC is set. (EA-4422)
---
 main/php_ini.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/main/php_ini.c b/main/php_ini.c
index 8c76a31..b87eb69 100644
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -603,7 +603,15 @@ int php_init_config(TSRMLS_D)
 	php_ini_scanned_path_len = strlen(php_ini_scanned_path);
 
 	/* Scan and parse any .ini files found in scan path if path not empty. */
-	if (!sapi_module.php_ini_ignore && php_ini_scanned_path_len) {
+
+    /* But only do this if PHPRC is undefined.  This way the ini files defined
+     * in the php.d directory do not override the user's custom settings.
+     *
+     * We don't leverage .user.ini due to EA3 backwards-compatibility.
+     *
+     * Case: EA-4422
+     */
+    if (!getenv("PHPRC") && !sapi_module.php_ini_ignore && php_ini_scanned_path_len) {
 		struct dirent **namelist;
 		int ndir, i;
 		struct stat sb;
-- 
2.8.4

Places

File php-5.4.x-ea4-ini.patch of Package scl-php54 (Revision 14d92579e7c9a23d4d8528be177f4b98)

Places