WordPress.org

Make WordPress Core

Changeset 24594


Ignore:
Timestamp:
07/08/2013 08:27:06 PM (6 years ago)
Author:
nacin
Message:

Support IIS 8 and above.

props hurtige for initial patch.
fixes #23533.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/includes/misc.php

    r24528 r24594  
    371371
    372372/**
    373  * Check if rewrite rule for WordPress already exists in the IIS 7 configuration file
     373 * Check if rewrite rule for WordPress already exists in the IIS 7+ configuration file
    374374 *
    375375 * @since 2.8.0
     
    429429
    430430/**
    431  * Add WordPress rewrite rule to the IIS 7 configuration file.
     431 * Add WordPress rewrite rule to the IIS 7+ configuration file.
    432432 *
    433433 * @since 2.8.0
  • trunk/wp-includes/canonical.php

    r24502 r24594  
    1919 *
    2020 * Prevents redirection for feeds, trackbacks, searches, comment popup, and
    21  * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7,
     21 * admin URLs. Does not redirect on non-pretty-permalink-supporting IIS 7+,
    2222 * page/post previews, WP admin, Trackbacks, robots.txt, searches, or on POST
    2323 * requests.
  • trunk/wp-includes/functions.php

    r24510 r24594  
    30393039
    30403040/**
    3041  * Check if IIS 7 supports pretty permalinks.
     3041 * Check if IIS 7+ supports pretty permalinks.
    30423042 *
    30433043 * @since 2.8.0
     
    30503050    $supports_permalinks = false;
    30513051    if ( $is_iis7 ) {
    3052         /* First we check if the DOMDocument class exists. If it does not exist,
    3053          * which is the case for PHP 4.X, then we cannot easily update the xml configuration file,
    3054          * hence we just bail out and tell user that pretty permalinks cannot be used.
    3055          * This is not a big issue because PHP 4.X is going to be deprecated and for IIS it
    3056          * is recommended to use PHP 5.X NTS.
     3052        /* First we check if the DOMDocument class exists. If it does not exist, then we cannot
     3053         * easily update the xml configuration file, hence we just bail out and tell user that
     3054         * pretty permalinks cannot be used.
     3055         *
    30573056         * Next we check if the URL Rewrite Module 1.1 is loaded and enabled for the web site. When
    30583057         * URL Rewrite 1.1 is loaded it always sets a server variable called 'IIS_UrlRewriteModule'.
  • trunk/wp-includes/vars.php

    r21367 r24594  
    9494
    9595/**
    96  * Whether the server software is IIS 7.X
     96 * Whether the server software is IIS 7.X or greater
    9797 * @global bool $is_iis7
    9898 */
    99 $is_iis7 = $is_IIS && (strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/7.') !== false);
     99$is_iis7 = $is_IIS && intval( substr( $_SERVER['SERVER_SOFTWARE'], strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/' ) + 14 ) ) >= 7;
    100100
    101101/**
Note: See TracChangeset for help on using the changeset viewer.