Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
isv:cpanel:EA4
scl-php71
0006-Ensure-that-php.d-is-not-scanned-when-PHPR...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0006-Ensure-that-php.d-is-not-scanned-when-PHPRC-is-set.patch of Package scl-php71
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jacob Perkins <jacob.perkins@cpanel.net> Date: Mon, 13 Jun 2016 22:35:54 -0500 Subject: [PATCH 06/15] 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 87287f9d..0c015d12 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -616,7 +616,15 @@ int php_init_config(void) php_ini_scanned_path_len = (int)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; zend_stat_t sb;
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor