Changeset 44671

Timestamp:

01/21/2019 07:09:23 PM (8 years ago)

Author:

flixos90

Message:

Bootstrap/Load: Ensure that the fatal error shutdown handler does not prevent other shutdown handlers from being called.

This changeset adds support for a new wp_die() argument exit, which defaults to true and determines whether wp_die() should actually terminate the request. The new fatal error handler then calls wp_die() with that argument set to false, as calling die() or exit from a PHP shutdown function prevents other shutdown functions from being called.

Props schlessera, johnbillion.
Fixes #46038. See #44458.

Location:

trunk/src/wp-includes

Files:

• class-wp-shutdown-handler.php (modified) (2 diffs)
• functions.php (modified) (7 diffs)

trunk/src/wp-includes/class-wp-shutdown-handler.php

@@ -137 +137 @@
                         if ( is_readable( $php_error_pluggable ) ) {
                                 require_once $php_error_pluggable;
-                                die();
+                                return;
                         }
                 }
@@ -167 +167 @@
                 $message = __( 'The site is experiencing technical difficulties.' );
 
-                $args = array( 'response' => 500 );
+                $args = array(
+                        'response' => 500,
+                        'exit'     => false,
+                );
                 if ( function_exists( 'admin_url' ) ) {
                         $args['link_url']  = admin_url();

trunk/src/wp-includes/functions.php

@@ -2958 +2958 @@
  *     @type string $code           Error code to use. Default is 'wp_die', or the main error code if $message
  *                                  is a WP_Error.
+ *     @type bool   $exit           Whether to exit the process after completion. Default true.
  * }
  */
@@ -3202 +3203 @@
 </html>
         <?php
-        die();
+        if ( $r['exit'] ) {
+                die();
+        }
 }
 
@@ -3237 +3240 @@
 
         echo wp_json_encode( $data );
-        die();
+        if ( $r['exit'] ) {
+                die();
+        }
 }
 
@@ -3263 +3268 @@
                 $wp_xmlrpc_server->output( $error->getXml() );
         }
-        die();
+        if ( $r['exit'] ) {
+                die();
+        }
 }
 
@@ -3292 +3299 @@
 
         if ( is_scalar( $message ) ) {
-                die( (string) $message );
-        }
-        die( '0' );
+                $message = (string) $message;
+        } else {
+                $message = '0';
+        }
+
+        if ( $r['exit'] ) {
+                die( $message );
+        }
+
+        echo $message;
 }
 
@@ -3303 +3317 @@
  *
  * @since 3.4.0
+ * @since 5.1.0 Added the $title and $args parameters.
  * @access private
  *
- * @param string $message Optional. Response to print. Default empty.
- */
-function _scalar_wp_die_handler( $message = '' ) {
+ * @param string       $message Optional. Response to print. Default empty.
+ * @param string       $title   Optional. Error title (unused). Default empty.
+ * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
+ */
+function _scalar_wp_die_handler( $message = '', $title = '', $args = array() ) {
+        list( $message, $title, $r ) = _wp_die_process_input( $message, $title, $args );
+
+        if ( $r['exit'] ) {
+                if ( is_scalar( $message ) ) {
+                        die( (string) $message );
+                }
+                die();
+        }
+
         if ( is_scalar( $message ) ) {
-                die( (string) $message );
-        }
-        die();
+                echo (string) $message;
+        }
 }
 
@@ -3329 +3354 @@
                 'response'          => 0,
                 'code'              => '',
+                'exit'              => true,
                 'back_link'         => false,
                 'link_url'          => '',