Merge remote-tracking branch 'origin/stable-3.0.5'

Marius Cramer

2014-01-23 cf646e99be232c783dcbae86e329470674772749

 server/plugins-available/apache2_plugin.inc.php

@@ -1019,6 +1019,7 @@
      }

      $tpl->setVar($vhost_data);
      $tpl->setVar('apache_version', $app->system->getapacheversion());

      // Rewrite rules
      $rewrite_rules = array();
@@ -1225,6 +1226,7 @@

         $fcgi_tpl = new tpl();
         $fcgi_tpl->newTemplate('php-fcgi-starter.master');
         $fcgi_tpl->setVar('apache_version', $app->system->getapacheversion());

         // Support for multiple PHP versions (FastCGI)
         if(trim($data['new']['fastcgi_php_version']) != ''){
@@ -1364,6 +1366,7 @@

         $cgi_tpl = new tpl();
         $cgi_tpl->newTemplate('php-cgi-starter.master');
         $cgi_tpl->setVar('apache_version', $app->system->getapacheversion());

         // 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'];
@@ -2028,6 +2031,7 @@

      $tpl = new tpl();
      $tpl->newTemplate('apache_ispconfig.conf.master');
      $tpl->setVar('apache_version', $app->system->getapacheversion());
      $records = $app->db->queryAllRecords('SELECT * FROM server_ip WHERE server_id = '.$conf['server_id']." AND virtualhost = 'y'");

      $records_out= array();
@@ -2737,7 +2741,8 @@
      $app->load('tpl');
      $tpl = new tpl();
      $tpl->newTemplate('php_fpm_pool.conf.master');

      $tpl->setVar('apache_version', $app->system->getapacheversion());
		
      if($data['new']['php_fpm_use_socket'] == 'y'){
         $use_tcp = 0;
         $use_socket = 1;