#35725: Make site.com:80 work like site.com

INSTALL.txt

@@ -162,9 +162,11 @@ INSTALLATION
      sites/example.com/settings.php
      sites/default/settings.php
 
-   If you are installing on a non-standard port number, the ':' is
-   replaced by a '.'. For example, http://www.drupal.org:8080/mysite/test/
-   could be loaded from sites/www.drupal.org.8080.mysite.test/.
+   If you are installing on a non-standard port, the port number is
+   treated as the deepest subdomain. For example: http://www.example.com:8080/
+   could be loaded from sites/8080.www.example.com/. The port number
+   will be removed according to the pattern above if no port-specific
+   configuration is found, just like a real subdomain.
 
    Each site configuration can have its own site-specific modules and
    themes that will be made available in addition to those installed

includes/bootstrap.inc

@@ -115,7 +115,7 @@ function conf_init() {
 
   $confdir = 'sites';
   $uri = explode('/', $_SERVER['PHP_SELF']);
-  $server = explode('.', str_replace(':', '.', rtrim($_SERVER['HTTP_HOST'], '.')));
+  $server = explode('.', implode('.', array_reverse(explode(':', rtrim($_SERVER['HTTP_HOST'], '.')))));
   for ($i = count($uri) - 1; $i > 0; $i--) {
     for ($j = count($server); $j > 0; $j--) {
       $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i));