Skip to content

Commit

Permalink
fix unnecessary idn encoding
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Kaufmann (d00p) <[email protected]>
  • Loading branch information
d00p committed Nov 4, 2016
1 parent c409d8a commit d6b5626
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ protected function getVhostContent($domain, $ssl_vhost = false, $ipid)
$domain['documentroot'] = trim($domain['documentroot']);

if (preg_match('/^https?\:\/\//', $domain['documentroot'])) {
$uri = $this->idnaConvert->encode_uri($domain['documentroot']);
$uri = $domain['documentroot'];
// prevent empty return-cde
$code = "301";
// Get domain's redirect code
Expand Down
2 changes: 1 addition & 1 deletion scripts/jobs/cron_tasks.inc.http.30.nginx.php
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ protected function getVhostContent($domain, $ssl_vhost = false)

// if the documentroot is an URL we just redirect
if (preg_match('/^https?\:\/\//', $domain['documentroot'])) {
$uri = $this->idnaConvert->encode_uri($domain['documentroot']);
$uri = $domain['documentroot'];
if (substr($uri, - 1) == '/') {
$uri = substr($uri, 0, - 1);
}
Expand Down

0 comments on commit d6b5626

Please sign in to comment.