Ticket #10187: 10187-10435-merged.patch

wp-admin/includes/misc.php

@@ -433 +433 @@
 }
 
 /**
- * Check if IIS 7 supports pretty permalinks
- *
- * @since 2.8.0
- *
- * @return bool
- */
-function iis7_supports_permalinks() {
-        global $is_iis7;
-
-        $supports_permalinks = false;
-        if ( $is_iis7 ) {
-                /* First we check if the DOMDocument class exists. If it does not exist,
-                 * which is the case for PHP 4.X, then we cannot easily update the xml configuration file,
-                 * hence we just bail out and tell user that pretty permalinks cannot be used.
-                 * This is not a big issue because PHP 4.X is going to be depricated and for IIS it
-                 * is recommended to use PHP 5.X NTS.
-                 * Next we check if the URL Rewrite Module 1.1 is loaded and enabled for the web site. When
-                 * URL Rewrite 1.1 is loaded it always sets a server variable called 'IIS_UrlRewriteModule'.
-                 * Lastly we make sure that PHP is running via FastCGI. This is important because if it runs
-                 * via ISAPI then pretty permalinks will not work.
-                 */
-                $supports_permalinks = class_exists('DOMDocument') && isset($_SERVER['IIS_UrlRewriteModule']) && ( php_sapi_name() == 'cgi-fcgi' );
-        }
-
-        return apply_filters('iis7_supports_permalinks', $supports_permalinks);
-}
-
-/**
  * Check if rewrite rule for WordPress already exists in the IIS 7 configuration file
  *
  * @since 2.8.0

wp-includes/canonical.php

@@ -39 +39 @@
 function redirect_canonical($requested_url=null, $do_redirect=true) {
         global $wp_rewrite, $is_IIS, $wp_query, $wpdb;
 
-        if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || $is_IIS || ( isset($_POST) && count($_POST) ) || is_preview() || is_robots() )
+        if ( is_trackback() || is_search() || is_comments_popup() || is_admin() || ( $is_IIS && !iis7_supports_permalinks() ) || ( isset($_POST) && count($_POST) ) || is_preview() || is_robots() )
                 return;
 
         if ( !$requested_url ) {

wp-includes/pluggable.php

@@ -839 +839 @@
 
 if ( !function_exists('wp_redirect') ) :
 /**
- * Redirects to another page, with a workaround for the IIS Set-Cookie bug.
+ * Redirects to another page
  *
- * @link http://support.microsoft.com/kb/q176113/
  * @since 1.5.1
  * @uses apply_filters() Calls 'wp_redirect' hook on $location and $status.
  *
@@ -850 +849 @@
  * @return bool False if $location is not set
  */
 function wp_redirect($location, $status = 302) {
-        global $is_IIS;
-
         $location = apply_filters('wp_redirect', $location, $status);
         $status = apply_filters('wp_redirect_status', $status, $location);
-
+        
         if ( !$location ) // allows the wp_redirect filter to cancel a redirect
                 return false;
-
+        
         $location = wp_sanitize_redirect($location);
-
-        if ( $is_IIS ) {
-                header("Refresh: 0;url=$location");
-        } else {
-                if ( php_sapi_name() != 'cgi-fcgi' )
-                        status_header($status); // This causes problems on IIS and some FastCGI setups
-                header("Location: $location", true, $status);
-        }
+        
+        header("Location: $location", true, $status);
 }
 endif;
 

wp-includes/vars.php

@@ -82 +82 @@
  */
 $is_iis7 = (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/7.') !== false);
 
+/**
+ * Check if IIS 7 supports pretty permalinks
+ *
+ * @since 2.8.0
+ *
+ * @return bool
+ */
+function iis7_supports_permalinks() {
+        global $is_iis7;
 
+        $supports_permalinks = false;
+        if ( $is_iis7 ) {
+                /* First we check if the DOMDocument class exists. If it does not exist,
+                 * which is the case for PHP 4.X, then we cannot easily update the xml configuration file,
+                 * hence we just bail out and tell user that pretty permalinks cannot be used.
+                 * This is not a big issue because PHP 4.X is going to be depricated and for IIS it
+                 * is recommended to use PHP 5.X NTS.
+                 * Next we check if the URL Rewrite Module 1.1 is loaded and enabled for the web site. When
+                 * URL Rewrite 1.1 is loaded it always sets a server variable called 'IIS_UrlRewriteModule'.
+                 * Lastly we make sure that PHP is running via FastCGI. This is important because if it runs
+                 * via ISAPI then pretty permalinks will not work.
+                 */
+                $supports_permalinks = class_exists('DOMDocument') && isset($_SERVER['IIS_UrlRewriteModule']) && ( php_sapi_name() == 'cgi-fcgi' );
+        }
+
+        return apply_filters('iis7_supports_permalinks', $supports_permalinks);
+}
 ?>
+ No newline at end of file