Leahnaya/pokemon-showdown-client
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown-client.git synced 2026-08-28 14:11:08 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #327 from kotarou3/virtualhost

Browse Source 
Only check if an address is already registered by hostname, not by IP
This commit is contained in:
Guangcong Luo
2015-02-11 13:17:47 -06:00
parent 2941c5a150 9a9d236093
commit f1ed3a2deb
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crossdomain.php
View File

@@ -56,19 +56,14 @@ if (isset($PokemonServers[$config['host']])) {
// see if this is actually a registered server
if ($config['host'] !== 'localhost') {
$ip = gethostbyname($config['host']);
foreach ($PokemonServers as &$server) {
if (!isset($server['ipcache'])) {
$server['ipcache'] = gethostbyname($server['server']);
}
if ($ip === $server['ipcache']) {
if (($config['port'] === $server['port']) ||
(isset($server['altport']) &&
$config['port'] === $server['altport'])) {
$path = isset($_REQUEST['path']) ? $_REQUEST['path'] : '';
$config['redirect'] = 'http://' . $server['id'] . '.psim.us/' . rawurlencode($path);
break;
}
if ($config['host'] === $server['server'] && (
$config['port'] === $server['port'] ||
(isset($server['altport']) && $config['port'] === $server['altport'])
)) {
$path = isset($_REQUEST['path']) ? $_REQUEST['path'] : '';
$config['redirect'] = 'http://' . $server['id'] . '.psim.us/' . rawurlencode($path);
break;
}
}
}