Skip to content

Commit 6b77f39

Browse files
author
Timo Boldt
committed
add apache_full_version variable for vhost template
See issue #4536
1 parent e41378e commit 6b77f39

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

server/plugins-available/apache2_plugin.inc.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1356,6 +1356,7 @@ function update($event_name, $data) {
13561356

13571357
$tpl->setVar($vhost_data);
13581358
$tpl->setVar('apache_version', $app->system->getapacheversion());
1359+
$tpl->setVar('apache_full_version', $app->system->getapacheversion(true));
13591360

13601361
// Rewrite rules
13611362
$rewrite_rules = array();
@@ -1566,6 +1567,7 @@ function update($event_name, $data) {
15661567
$fcgi_tpl = new tpl();
15671568
$fcgi_tpl->newTemplate('php-fcgi-starter.master');
15681569
$fcgi_tpl->setVar('apache_version', $app->system->getapacheversion());
1570+
$fcgi_tpl->setVar('apache_full_version', $app->system->getapacheversion(true));
15691571

15701572
// Support for multiple PHP versions (FastCGI)
15711573
if(trim($data['new']['fastcgi_php_version']) != ''){
@@ -1708,6 +1710,7 @@ function update($event_name, $data) {
17081710
$cgi_tpl = new tpl();
17091711
$cgi_tpl->newTemplate('php-cgi-starter.master');
17101712
$cgi_tpl->setVar('apache_version', $app->system->getapacheversion());
1713+
$cgi_tpl->setVar('apache_full_version', $app->system->getapacheversion(true));
17111714

17121715
// This works because PHP "rewrites" a symlink to the physical path
17131716
$php_open_basedir = ($data['new']['php_open_basedir'] == '')?$data['new']['document_root']:$data['new']['php_open_basedir'];
@@ -2345,6 +2348,7 @@ function server_ip($event_name, $data) {
23452348
$tpl = new tpl();
23462349
$tpl->newTemplate('apache_ispconfig.conf.master');
23472350
$tpl->setVar('apache_version', $app->system->getapacheversion());
2351+
$tpl->setVar('apache_full_version', $app->system->getapacheversion(true));
23482352
$records = $app->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ? AND virtualhost = 'y'", $conf['server_id']);
23492353

23502354
$records_out= array();
@@ -3128,6 +3132,7 @@ private function php_fpm_pool_update ($data, $web_config, $pool_dir, $pool_name,
31283132
$tpl = new tpl();
31293133
$tpl->newTemplate('php_fpm_pool.conf.master');
31303134
$tpl->setVar('apache_version', $app->system->getapacheversion());
3135+
$tpl->setVar('apache_full_version', $app->system->getapacheversion(true));
31313136

31323137
$apache_modules = $app->system->getapachemodules();
31333138

0 commit comments

Comments
 (0)