Index: bootstrap.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/bootstrap.inc,v
retrieving revision 1.28
diff -u -F^f -r1.28 bootstrap.inc
--- bootstrap.inc	16 Sep 2004 07:17:54 -0000	1.28
+++ bootstrap.inc	17 Sep 2004 21:37:38 -0000
@@ -366,9 +367,12 @@ function check_url($uri) {
  * equivalent using other environment vars.
  */
 function request_uri() {
+  global $base_url;
+
+  $parsed = parse_url($base_url);
 
-  if (isset($_SERVER['REQUEST_URI'])) {
-    $uri = $_SERVER['REQUEST_URI'];
+  if (isset($parsed['path'])) {
+    $uri = str_replace($parsed['path'], '', $_SERVER['PHP_SELF']) .'?'. $_SERVER['argv'][0];
   }
   else {
     $uri = $_SERVER['PHP_SELF'] .'?'. $_SERVER['argv'][0];