golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@6208 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2007-10-09 17:38:25 +00:00
parent 60cde1b789
commit c698c97198
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-settings.php
View File

@ -36,16 +36,10 @@ if ( empty( $_SERVER['REQUEST_URI'] ) ) {
else if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { else if (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL']; $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
} }
else { else
// If root then simulate that no script-name was specified {
if (empty($_SERVER['PATH_INFO'])) { // Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
if (isset($_SERVER['ORIG_PATH_INFO'])) if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
$_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)
$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO']; $_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
else else
$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO']; $_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];