Changeset 31120

Timestamp:

01/10/2015 04:58:49 AM (10 years ago)

Author:

wonderboymusic

Message:

Use PHP_SAPI constant instead of php_sapi_name() in iis7_supports_permalinks(), wp_fix_server_vars(), and wp_redirect().

See #30799.

Location:

trunk/src/wp-includes

Files:

• functions.php (modified) (1 diff)
• load.php (modified) (1 diff)
• pluggable.php (modified) (1 diff)

trunk/src/wp-includes/functions.php

@@ -3620 +3620 @@
          * via ISAPI then pretty permalinks will not work.
          */
-        $supports_permalinks = class_exists('DOMDocument') && isset($_SERVER['IIS_UrlRewriteModule']) && ( php_sapi_name() == 'cgi-fcgi' );
+        $supports_permalinks = class_exists('DOMDocument') && isset($_SERVER['IIS_UrlRewriteModule']) && ( PHP_SAPI == 'cgi-fcgi' );
     }
 

trunk/src/wp-includes/load.php

@@ -53 +53 @@
 
     // Fix for IIS when running with PHP ISAPI
-    if ( empty( $_SERVER['REQUEST_URI'] ) || ( php_sapi_name() != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
+    if ( empty( $_SERVER['REQUEST_URI'] ) || ( PHP_SAPI != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
 
         // IIS Mod-Rewrite

trunk/src/wp-includes/pluggable.php

@@ -1173 +1173 @@
     $location = wp_sanitize_redirect($location);
 
-    if ( !$is_IIS && php_sapi_name() != 'cgi-fcgi' )
+    if ( !$is_IIS && PHP_SAPI != 'cgi-fcgi' )
         status_header($status); // This causes problems on IIS and some FastCGI setups