Index: bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.83
diff -u -F^f -r1.83 bootstrap.inc
--- bootstrap.inc	21 Jan 2006 08:28:54 -0000	1.83
+++ bootstrap.inc	22 Jan 2006 23:40:11 -0000
@@ -121,15 +121,18 @@ function conf_init() {
 
   $confdir = 'sites';
   $uri = explode('/', $_SERVER['PHP_SELF']);
+  array_pop($uri);
+  $uri_string  = '';
   $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));
+  while(count($uri)>0) {
+    for ($j = 0; $j < count($server); $j++) {
+      $dir = implode('.', array_slice($server, $j)) . $uri_string;
       if (file_exists("$confdir/$dir/settings.php")) {
         $conf = "$confdir/$dir";
         return $conf;
       }
     }
+    $uri_string = '.'. array_pop($uri) . $uri_string;
   }
   $conf = "$confdir/default";
   return $conf;