Index: wp-settings.php
===================================================================
--- wp-settings.php	(revision 7159)
+++ wp-settings.php	(working copy)
@@ -79,6 +79,8 @@
 			$_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
 		}
 	}
+} else {
+	$_SERVER['REQUEST_URI'] = preg_replace('|^.*' . $_SERVER['HTTP_HOST'] . '|i', '', $_SERVER['REQUEST_URI']);
 }
 
 // Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests