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

improve behavior of ssl-redirect, fixes #541

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2011-01-08 11:58:14 +00:00
parent 4f52982a7e
commit 98b82ed0c6
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -757,6 +757,14 @@ class apache
if(preg_match('/^https?\:\/\//', $domain['documentroot'])) if(preg_match('/^https?\:\/\//', $domain['documentroot']))
{ {
// redirect everything, not only root-directory, #541
$vhost_content.= ' <IfModule mod_rewrite.c>'."\n";
$vhost_content.= ' RewriteEngine On' . "\n";
$vhost_content.= ' RewriteCond %{HTTPS} off' . "\n";
$vhost_content.= ' RewriteRule (.*) '. $this->idnaConvert->encode($domain['documentroot']).'%{REQUEST_URI}'. "\n";
$vhost_content.= ' </IfModule>' . "\n";
$code = getDomainRedirectCode($domain['id']); $code = getDomainRedirectCode($domain['id']);
$vhost_content.= ' Redirect '.$code.' / ' . $this->idnaConvert->encode($domain['documentroot']) . "\n"; $vhost_content.= ' Redirect '.$code.' / ' . $this->idnaConvert->encode($domain['documentroot']) . "\n";
} }