From 6b77f39dfb0c5f495ceb5839e7779b478067580a Mon Sep 17 00:00:00 2001
From: Timo Boldt <timo.boldt@technobase.fm>
Date: Thu, 23 Feb 2017 15:27:09 +0100
Subject: [PATCH] add apache_full_version variable for vhost template
See issue #4536
---
server/plugins-available/apache2_plugin.inc.php | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 9f8e293ad3..762d4b67bc 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1356,6 +1356,7 @@ class apache2_plugin {
$tpl->setVar($vhost_data);
$tpl->setVar('apache_version', $app->system->getapacheversion());
+ $tpl->setVar('apache_full_version', $app->system->getapacheversion(true));
// Rewrite rules
$rewrite_rules = array();
@@ -1566,6 +1567,7 @@ class apache2_plugin {
$fcgi_tpl = new tpl();
$fcgi_tpl->newTemplate('php-fcgi-starter.master');
$fcgi_tpl->setVar('apache_version', $app->system->getapacheversion());
+ $fcgi_tpl->setVar('apache_full_version', $app->system->getapacheversion(true));
// Support for multiple PHP versions (FastCGI)
if(trim($data['new']['fastcgi_php_version']) != ''){
@@ -1708,6 +1710,7 @@ class apache2_plugin {
$cgi_tpl = new tpl();
$cgi_tpl->newTemplate('php-cgi-starter.master');
$cgi_tpl->setVar('apache_version', $app->system->getapacheversion());
+ $cgi_tpl->setVar('apache_full_version', $app->system->getapacheversion(true));
// This works because PHP "rewrites" a symlink to the physical path
$php_open_basedir = ($data['new']['php_open_basedir'] == '')?$data['new']['document_root']:$data['new']['php_open_basedir'];
@@ -2345,6 +2348,7 @@ class apache2_plugin {
$tpl = new tpl();
$tpl->newTemplate('apache_ispconfig.conf.master');
$tpl->setVar('apache_version', $app->system->getapacheversion());
+ $tpl->setVar('apache_full_version', $app->system->getapacheversion(true));
$records = $app->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ? AND virtualhost = 'y'", $conf['server_id']);
$records_out= array();
@@ -3128,6 +3132,7 @@ class apache2_plugin {
$tpl = new tpl();
$tpl->newTemplate('php_fpm_pool.conf.master');
$tpl->setVar('apache_version', $app->system->getapacheversion());
+ $tpl->setVar('apache_full_version', $app->system->getapacheversion(true));
$apache_modules = $app->system->getapachemodules();
--
GitLab