--- bootstrap-bck.inc	2008-10-08 08:59:37.000000000 -0400
+++ bootstrap.inc	2008-10-08 09:01:59.000000000 -0400
@@ -728,23 +728,9 @@ function drupal_validate_utf8($text) {
  * generate an equivalent using other environment variables.
  */
 function request_uri() {
-
-  if (isset($_SERVER['REQUEST_URI'])) {
-    $uri = $_SERVER['REQUEST_URI'];
-  }
-  else {
-    if (isset($_SERVER['argv'])) {
-      $uri = $_SERVER['SCRIPT_NAME'] .'?'. $_SERVER['argv'][0];
-    }
-    elseif (isset($_SERVER['QUERY_STRING'])) {
-      $uri = $_SERVER['SCRIPT_NAME'] .'?'. $_SERVER['QUERY_STRING'];
-    }
-    else {
-      $uri = $_SERVER['SCRIPT_NAME'];
-    }
-  }
-
-  return $uri;
+  global $base_url;
+  $parts = parse_url($base_url);
+  return $parts['path'] . "/" . $_REQUEST['q'];
 }
 
 /**