From 044d460b3158dc7054608fe450dc6e36e1e76664 Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 28 Jun 2009 00:45:12 +0000
Subject: [PATCH] Improved $_SERVER['REQUEST_URI'] test for IIS, props ruslany,
 fixes #5682 for trunk

git-svn-id: http://svn.automattic.com/wordpress/trunk@11662 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-settings.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-settings.php b/wp-settings.php
index aaf42bc8a..af78449d0 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -60,8 +60,8 @@ $_REQUEST = array_merge($_GET, $_POST);
 if ( ! isset($blog_id) )
 	$blog_id = 1;
 
-// Fix for IIS, which doesn't set REQUEST_URI
-if ( empty( $_SERVER['REQUEST_URI'] ) ) {
+// Fix for IIS when running with PHP ISAPI
+if ( empty( $_SERVER['REQUEST_URI'] ) || ( php_sapi_name() != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
 
 	// IIS Mod-Rewrite
 	if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {