bug #437
This commit is contained in:
parent
6cc844b2f9
commit
a3dfb55029
1 changed files with 8 additions and 0 deletions
8
boot.php
8
boot.php
|
@ -352,6 +352,14 @@ if(! class_exists('App')) {
|
|||
|
||||
if(x($_SERVER,'SERVER_NAME')) {
|
||||
$this->hostname = $_SERVER['SERVER_NAME'];
|
||||
if(stristr($this->hostname,'xn--')) {
|
||||
// PHP or webserver may have converted idn to punycode, so
|
||||
// convert punycode back to utf-8
|
||||
require_once('library/simplepie/idn/idna_convert.class.php');
|
||||
$x = new idna_convert();
|
||||
$this->hostname = $x->decode($s);
|
||||
}
|
||||
|
||||
if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
|
||||
$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue