Changeset 24594

Timestamp:

07/08/2013 08:27:06 PM (12 years ago)

Author:

nacin

Message:

Support IIS 8 and above.

props hurtige for initial patch.
fixes #23533.

Location:

trunk

Files:

• wp-admin/includes/misc.php (modified) (2 diffs)
• wp-includes/canonical.php (modified) (1 diff)
• wp-includes/functions.php (modified) (2 diffs)
• wp-includes/vars.php (modified) (1 diff)

trunk/wp-admin/includes/misc.php

@@ -371 +371 @@
 
 /**
- * Check if rewrite rule for WordPress already exists in the IIS 7 configuration file
+ * Check if rewrite rule for WordPress already exists in the IIS 7+ configuration file
  *
  * @since 2.8.0
@@ -429 +429 @@
 
 /**
- * Add WordPress rewrite rule to the IIS 7 configuration file.
+ * Add WordPress rewrite rule to the IIS 7+ configuration file.
  *
  * @since 2.8.0

trunk/wp-includes/canonical.php

@@ -19 +19 @@
  *
  * Prevents redirection for feeds, trackbacks, searches, comment popup, and
- * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7,
+ * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7+,
  * page/post previews, WP admin, Trackbacks, robots.txt, searches, or on POST
  * requests.

trunk/wp-includes/functions.php

@@ -3039 +3039 @@
 
 /**
- * Check if IIS 7 supports pretty permalinks.
+ * Check if IIS 7+ supports pretty permalinks.
  *
  * @since 2.8.0
@@ -3050 +3050 @@
     $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 deprecated and for IIS it
-         * is recommended to use PHP 5.X NTS.
+        /* First we check if the DOMDocument class exists. If it does not exist, then we cannot
+         * easily update the xml configuration file, hence we just bail out and tell user that
+         * pretty permalinks cannot be used.
+         *
          * 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'.

trunk/wp-includes/vars.php

@@ -94 +94 @@
 
 /**
- * Whether the server software is IIS 7.X
+ * Whether the server software is IIS 7.X or greater
  * @global bool $is_iis7
  */
-$is_iis7 = $is_IIS && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/7.') !== false);
+$is_iis7 = $is_IIS && intval( substr( $_SERVER['SERVER_SOFTWARE'], strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/' ) + 14 ) ) >= 7;
 
 /**