WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://svn.automattic.com/wordpress/trunk@11662 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
azaozz 2009-06-28 00:45:12 +00:00
parent daa5da7259
commit 044d460b31
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-settings.php
View File

@ -60,8 +60,8 @@ $_REQUEST = array_merge($_GET, $_POST);
if ( ! isset($blog_id) ) if ( ! isset($blog_id) )
$blog_id = 1; $blog_id = 1;
// Fix for IIS, which doesn't set REQUEST_URI // Fix for IIS when running with PHP ISAPI
if ( empty( $_SERVER['REQUEST_URI'] ) ) { if ( empty( $_SERVER['REQUEST_URI'] ) || ( php_sapi_name() != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
// IIS Mod-Rewrite // IIS Mod-Rewrite
if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) { if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {