Index: wp-includes/load.php
===================================================================
--- wp-includes/load.php	(revision 33291)
+++ wp-includes/load.php	(working copy)
@@ -80,7 +80,7 @@
 	}
 
 	// Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests
-	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) )
+	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && preg_match( '/php\.cgi$/', $_SERVER['SCRIPT_FILENAME'] ) )
 		$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
 
 	// Fix for Dreamhost and other PHP as CGI hosts