Index: wp-settings.php
===================================================================
--- wp-settings.php	(revision 6052)
+++ wp-settings.php	(working copy)
@@ -40,6 +40,8 @@
 		// If root then simulate that no script-name was specified
 		if (empty($_SERVER['PATH_INFO']))
 			$_SERVER['REQUEST_URI'] = substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/')) . '/';
+		elseif ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
+			$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
 		else
 			$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];