maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Apache: ServerAlias length limit not obeyed, fixes #1012

Browse Source 
Signed-off-by: Robert Förster (Dessa) <Dessa@froxlor.org>
This commit is contained in:
lowb1rd
2012-01-06 14:46:39 +01:00
committed by Robert Förster (Dessa)
parent 346351ef98
commit 11f3ddf54a
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -446,11 +446,16 @@ class apache
} }
} }
if(trim($server_alias) != '')
{
$servernames_text.= ' ServerAlias ' . $server_alias . "\n";
}
$alias_domains = $this->db->query('SELECT `domain`, `iswildcarddomain`, `wwwserveralias` FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `aliasdomain`=\'' . $domain['id'] . '\''); $alias_domains = $this->db->query('SELECT `domain`, `iswildcarddomain`, `wwwserveralias` FROM `' . TABLE_PANEL_DOMAINS . '` WHERE `aliasdomain`=\'' . $domain['id'] . '\'');
while(($alias_domain = $this->db->fetch_array($alias_domains)) !== false) while(($alias_domain = $this->db->fetch_array($alias_domains)) !== false)
{ {
$server_alias.= ' ' . $alias_domain['domain']; $server_alias = ' ServerAlias ' . $alias_domain['domain'];
if($alias_domain['iswildcarddomain'] == '1') if($alias_domain['iswildcarddomain'] == '1')
{ {
@@ -463,11 +468,8 @@ class apache
$server_alias.= ' www.' . $alias_domain['domain']; $server_alias.= ' www.' . $alias_domain['domain'];
} }
} }
}
if(trim($server_alias) != '') $servernames_text.= $server_alias . "\n";
{
$servernames_text.= ' ServerAlias ' . $server_alias . "\n";
} }
$servernames_text.= ' ServerAdmin ' . $domain['email'] . "\n"; $servernames_text.= ' ServerAdmin ' . $domain['email'] . "\n";