diff options
| author | friendica <info@friendica.com> | 2012-06-30 06:27:46 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-06-30 06:27:46 -0700 |
| commit | a3dfb5502966a9c5cd9f67ecebc94a6633d5cec3 (patch) | |
| tree | 6e736880965d1a6ccd61a030761e3a809778de3b /boot.php | |
| parent | 6cc844b2f984f445549acc79105ae32baab20484 (diff) | |
| download | volse-hubzilla-a3dfb5502966a9c5cd9f67ecebc94a6633d5cec3.tar.gz volse-hubzilla-a3dfb5502966a9c5cd9f67ecebc94a6633d5cec3.tar.bz2 volse-hubzilla-a3dfb5502966a9c5cd9f67ecebc94a6633d5cec3.zip | |
bug #437
Diffstat (limited to 'boot.php')
| -rw-r--r-- | boot.php | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -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']; /** |