Permalink
Browse files

Improved $_SERVER['REQUEST_URI'] test for IIS, props ruslany, fixes #…

…5682 for 2.8

git-svn-id: http://svn.automattic.com/wordpress/branches/2.8@11661 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information...
azaozz
azaozz committed Jun 28, 2009
1 parent 1215847 commit 854dd6ff22922d3aa366b2728a62c8eb2b7dd998
Showing with 2 additions and 2 deletions.
  1. +2 −2 wp-settings.php
View
@@ -60,8 +60,8 @@ function wp_unregister_GLOBALS() {
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'])) {

0 comments on commit 854dd6f

Please sign in to comment.