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

when redirecting to an uri, don't use a trailing slash in order for the redirect to be correct, fixes #1411

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2014-05-02 08:49:27 +02:00
parent fceffc05e7
commit fb3d0269a1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/jobs/cron_tasks.inc.http.30.nginx.php
View File

@@ -397,7 +397,11 @@ class nginx {
// if the documentroot is an URL we just redirect
if (preg_match('/^https?\:\/\//', $domain['documentroot'])) {
$vhost_content .= "\t".'rewrite ^(.*) '.$this->idnaConvert->encode($domain['documentroot']).'$1 permanent;'."\n";
$uri = $this->idnaConvert->encode($domain['documentroot']);
if (substr($uri, -1) == '/') {
$uri = substr($uri, 0, -1);
}
$vhost_content .= "\t".'rewrite ^(.*) '.$uri.'$1 permanent;'."\n";
} else {
mkDirWithCorrectOwnership($domain['customerroot'], $domain['documentroot'], $domain['guid'], $domain['guid'], true);