Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.44
diff -u -F^f -r1.44 bootstrap.inc
--- includes/bootstrap.inc	5 Apr 2005 19:00:24 -0000	1.44
+++ includes/bootstrap.inc	8 Apr 2005 07:07:56 -0000
@@ -50,7 +50,7 @@ function conf_init() {
 
   $confdir = 'sites';
   $uri = explode('/', $_SERVER['PHP_SELF']);
-  $server = explode('.', rtrim($_SERVER['HTTP_HOST'], '.'));
+  $server = explode('.', preg_replace('/:\d+|\.+$/', '', $_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));