Changeset 6208

Timestamp:

10/09/2007 05:38:25 PM (17 years ago)

Author:

markjaquith

Message:

IIS REQUEST_URI-setting fixes from snakefoot. fixes #5160 for trunk

File:

• trunk/wp-settings.php (modified) (1 diff)

trunk/wp-settings.php

@@ -37 +37 @@
         $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
     }
-    else {
-        // If root then simulate that no script-name was specified
-        if (empty($_SERVER['PATH_INFO'])) {
-            if (isset($_SERVER['ORIG_PATH_INFO']))
-                $_SERVER['REQUEST_URI'] = $_SERVER['ORIG_PATH_INFO'];
-            else
-                $_SERVER['REQUEST_URI'] = substr($_SERVER['SCRIPT_NAME'], 0, strrpos($_SERVER['SCRIPT_NAME'], '/')) . '/';
-    }
-        elseif ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
-            // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
+    else
+    {
+        // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
+        if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
             $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
         else