Changeset 6058

Timestamp:

09/07/2007 02:43:00 AM (17 years ago)

Author:

markjaquith

Message:

Correctly set REQUEST_URI for IIS setups that put that info into SCRIPT_NAME as well as PATH_INFO. props snakefoot and Nazgul. fixes #4853

File:

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

trunk/wp-settings.php

@@ -41 +41 @@
         if (empty($_SERVER['PATH_INFO']))
             $_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)
+            $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
         else
             $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];