Index: includes/bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.96
diff -u -p -r1.96 bootstrap.inc
--- includes/bootstrap.inc	28 Apr 2006 11:52:31 -0000	1.96
+++ includes/bootstrap.inc	1 May 2006 17:34:39 -0000
@@ -156,7 +156,8 @@ function conf_init() {
   if (isset($base_url)) {
     // Parse fixed base URL from settings.php.
     $parts = parse_url($base_url);
-    $base_path = isset($parts['path']) ? $parts['path'] . '/' : '/';
+    $parts['path'] = isset($parts['path']) ? $parts['path'] : '';
+    $base_path = $parts['path'] . '/';
     // Build $base_root (everything until first slash after "scheme://").
     $base_root = substr($base_url, 0, strlen($base_url) - strlen($parts['path']));
   }