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

fix unnecessary idn encoding

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2016-11-04 18:28:32 +01:00
parent c409d8a6ba
commit d6b56262ce
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
View File

@@ -431,7 +431,7 @@ class lighttpd extends HttpConfigBase
$domain['documentroot'] = trim($domain['documentroot']); $domain['documentroot'] = trim($domain['documentroot']);
if (preg_match('/^https?\:\/\//', $domain['documentroot'])) { if (preg_match('/^https?\:\/\//', $domain['documentroot'])) {
$uri = $this->idnaConvert->encode_uri($domain['documentroot']); $uri = $domain['documentroot'];
// prevent empty return-cde // prevent empty return-cde
$code = "301"; $code = "301";
// Get domain's redirect code // Get domain's redirect code

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

@@ -456,7 +456,7 @@ class nginx extends HttpConfigBase
// if the documentroot is an URL we just redirect // if the documentroot is an URL we just redirect
if (preg_match('/^https?\:\/\//', $domain['documentroot'])) { if (preg_match('/^https?\:\/\//', $domain['documentroot'])) {
$uri = $this->idnaConvert->encode_uri($domain['documentroot']); $uri = $domain['documentroot'];
if (substr($uri, - 1) == '/') { if (substr($uri, - 1) == '/') {
$uri = substr($uri, 0, - 1); $uri = substr($uri, 0, - 1);
} }