Skip to content

Commit ab79c2c

Browse files
author
Marius Cramer
committed
- ported patch
1 parent 19684b3 commit ab79c2c

File tree

2 files changed

+14
-4
lines changed

2 files changed

+14
-4
lines changed

‎server/plugins-available/apache2_plugin.inc.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1423,6 +1423,7 @@ function update($event_name, $data) {
14231423
} else {
14241424
$pool_dir = $custom_php_fpm_pool_dir;
14251425
}
1426+
$pool_dir = trim($pool_dir);
14261427
if(substr($pool_dir, -1) != '/') $pool_dir .= '/';
14271428
$pool_name = 'web'.$data['new']['domain_id'];
14281429
$socket_dir = escapeshellcmd($web_config['php_fpm_socket_dir']);
@@ -2862,6 +2863,7 @@ private function hhvm_update($data, $web_config) {
28622863
//* Update the PHP-FPM pool configuration file
28632864
private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name, $socket_dir) {
28642865
global $app, $conf;
2866+
$pool_dir = trim($pool_dir);
28652867
//$reload = false;
28662868

28672869
if($data['new']['php'] == 'php-fpm'){
@@ -3013,7 +3015,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
30133015
unset($tpl);
30143016

30153017
// delete pool in all other PHP versions
3016-
$default_pool_dir = escapeshellcmd($web_config['php_fpm_pool_dir']);
3018+
$default_pool_dir = trim(escapeshellcmd($web_config['php_fpm_pool_dir']));
30173019
if(substr($default_pool_dir, -1) != '/') $default_pool_dir .= '/';
30183020
if($default_pool_dir != $pool_dir){
30193021
if ( @is_file($default_pool_dir.$pool_name.'.conf') ) {
@@ -3025,6 +3027,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
30253027
$php_versions = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ?", $conf["server_id"]);
30263028
if(is_array($php_versions) && !empty($php_versions)){
30273029
foreach($php_versions as $php_version){
3030+
$php_version['php_fpm_pool_dir'] = trim($php_version['php_fpm_pool_dir']);
30283031
if(substr($php_version['php_fpm_pool_dir'], -1) != '/') $php_version['php_fpm_pool_dir'] .= '/';
30293032
if($php_version['php_fpm_pool_dir'] != $pool_dir){
30303033
if ( @is_file($php_version['php_fpm_pool_dir'].$pool_name.'.conf') ) {
@@ -3065,6 +3068,7 @@ private function php_fpm_pool_delete ($data, $web_config) {
30653068
} else {
30663069
$pool_dir = $custom_php_fpm_pool_dir;
30673070
}
3071+
$pool_dir = trim($pool_dir);
30683072

30693073
if(substr($pool_dir, -1) != '/') $pool_dir .= '/';
30703074
$pool_name = 'web'.$data['old']['domain_id'];
@@ -3077,7 +3081,7 @@ private function php_fpm_pool_delete ($data, $web_config) {
30773081
}
30783082

30793083
// delete pool in all other PHP versions
3080-
$default_pool_dir = escapeshellcmd($web_config['php_fpm_pool_dir']);
3084+
$default_pool_dir = trim(escapeshellcmd($web_config['php_fpm_pool_dir']));
30813085
if(substr($default_pool_dir, -1) != '/') $default_pool_dir .= '/';
30823086
if($default_pool_dir != $pool_dir){
30833087
if ( @is_file($default_pool_dir.$pool_name.'.conf') ) {
@@ -3089,6 +3093,7 @@ private function php_fpm_pool_delete ($data, $web_config) {
30893093
$php_versions = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ?", $data['old']['server_id']);
30903094
if(is_array($php_versions) && !empty($php_versions)){
30913095
foreach($php_versions as $php_version){
3096+
$php_version['php_fpm_pool_dir'] = trim($php_version['php_fpm_pool_dir']);
30923097
if(substr($php_version['php_fpm_pool_dir'], -1) != '/') $php_version['php_fpm_pool_dir'] .= '/';
30933098
if($php_version['php_fpm_pool_dir'] != $pool_dir){
30943099
if ( @is_file($php_version['php_fpm_pool_dir'].$pool_name.'.conf') ) {

‎server/plugins-available/nginx_plugin.inc.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,7 @@ function update($event_name, $data) {
959959
} else {
960960
$pool_dir = $custom_php_fpm_pool_dir;
961961
}
962+
$pool_dir = trim($pool_dir);
962963
if(substr($pool_dir, -1) != '/') $pool_dir .= '/';
963964
$pool_name = 'web'.$data['new']['domain_id'];
964965
$socket_dir = escapeshellcmd($web_config['php_fpm_socket_dir']);
@@ -2418,6 +2419,7 @@ private function hhvm_update($data, $web_config) {
24182419
//* Update the PHP-FPM pool configuration file
24192420
private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name, $socket_dir) {
24202421
global $app, $conf;
2422+
$pool_dir = trim($pool_dir);
24212423
/*
24222424
if(trim($data['new']['fastcgi_php_version']) != ''){
24232425
$default_php_fpm = false;
@@ -2570,7 +2572,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
25702572
unset($tpl);
25712573

25722574
// delete pool in all other PHP versions
2573-
$default_pool_dir = escapeshellcmd($web_config['php_fpm_pool_dir']);
2575+
$default_pool_dir = trim(escapeshellcmd($web_config['php_fpm_pool_dir']));
25742576
if(substr($default_pool_dir, -1) != '/') $default_pool_dir .= '/';
25752577
if($default_pool_dir != $pool_dir){
25762578
if ( @is_file($default_pool_dir.$pool_name.'.conf') ) {
@@ -2582,6 +2584,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
25822584
$php_versions = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ?", $conf["server_id"]);
25832585
if(is_array($php_versions) && !empty($php_versions)){
25842586
foreach($php_versions as $php_version){
2587+
$php_version['php_fpm_pool_dir'] = trim($php_version['php_fpm_pool_dir']);
25852588
if(substr($php_version['php_fpm_pool_dir'], -1) != '/') $php_version['php_fpm_pool_dir'] .= '/';
25862589
if($php_version['php_fpm_pool_dir'] != $pool_dir){
25872590
if ( @is_file($php_version['php_fpm_pool_dir'].$pool_name.'.conf') ) {
@@ -2618,6 +2621,7 @@ private function php_fpm_pool_delete ($data, $web_config) {
26182621
} else {
26192622
$pool_dir = $custom_php_fpm_pool_dir;
26202623
}
2624+
$pool_dir = trim($pool_dir);
26212625

26222626
if(substr($pool_dir, -1) != '/') $pool_dir .= '/';
26232627
$pool_name = 'web'.$data['old']['domain_id'];
@@ -2628,7 +2632,7 @@ private function php_fpm_pool_delete ($data, $web_config) {
26282632
}
26292633

26302634
// delete pool in all other PHP versions
2631-
$default_pool_dir = escapeshellcmd($web_config['php_fpm_pool_dir']);
2635+
$default_pool_dir = trim(escapeshellcmd($web_config['php_fpm_pool_dir']));
26322636
if(substr($default_pool_dir, -1) != '/') $default_pool_dir .= '/';
26332637
if($default_pool_dir != $pool_dir){
26342638
if ( @is_file($default_pool_dir.$pool_name.'.conf') ) {
@@ -2640,6 +2644,7 @@ private function php_fpm_pool_delete ($data, $web_config) {
26402644
$php_versions = $app->db->queryAllRecords("SELECT * FROM server_php WHERE php_fpm_init_script != '' AND php_fpm_ini_dir != '' AND php_fpm_pool_dir != '' AND server_id = ?", $data['old']['server_id']);
26412645
if(is_array($php_versions) && !empty($php_versions)){
26422646
foreach($php_versions as $php_version){
2647+
$php_version['php_fpm_pool_dir'] = trim($php_version['php_fpm_pool_dir']);
26432648
if(substr($php_version['php_fpm_pool_dir'], -1) != '/') $php_version['php_fpm_pool_dir'] .= '/';
26442649
if($php_version['php_fpm_pool_dir'] != $pool_dir){
26452650
if ( @is_file($php_version['php_fpm_pool_dir'].$pool_name.'.conf') ) {

0 commit comments

Comments
 (0)