IIS REQUEST_URI-setting fixes from snakefoot. fixes #5160 for trunk
git-svn-id: https://develop.svn.wordpress.org/trunk@6208 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
parent
b307377ea1
commit
d260446047
@ -36,16 +36,10 @@ if ( empty( $_SERVER['REQUEST_URI'] ) ) {
|
||||
else if (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
|
||||
$_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)
|
||||
if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
|
||||
$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
|
||||
else
|
||||
$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
|
||||
|
Loading…
Reference in New Issue
Block a user