Changeset 45111 for trunk/src/wp-admin/includes/class-wp-debug-data.php

Timestamp:

04/04/2019 09:53:45 PM (7 years ago)

Author:

azaozz

Message:

Site health: fix usage of max_execution_time. When PHP is run from the cli the default is 0.

Fixes #46645.

File:

• trunk/src/wp-admin/includes/class-wp-debug-data.php (modified) (3 diffs)

trunk/src/wp-admin/includes/class-wp-debug-data.php

@@ -318 +318 @@
          * hosts do not allow you to read configuration values.
          */
-        $max_execution_time = 30;
-
         if ( function_exists( 'ini_get' ) ) {
             $max_execution_time = ini_get( 'max_execution_time' );
+        }
+
+        // The max_execution_time defaults to 0 when PHP runs from cli.
+        // We still want to limit it below.
+        if ( empty( $max_execution_time ) ) {
+            $max_execution_time = 30;
         }
 
@@ -329 +333 @@
         if ( $max_execution_time > 20 ) {
             $max_execution_time = 20;
-        } elseif ( $max_execution_time > 2 ) {
+        } elseif ( $max_execution_time > 10 ) {
             // If the max_execution_time is set to lower than 20 seconds, reduce it a bit to prevent
             // edge-case timeouts that may happen after the size loop has finished running.
@@ -368 +372 @@
 
             if ( $dir_size === false ) {
-                // Error reading
-                $dir_size   = $inaccessible;
+                // Error reading.
+                $dir_size = $inaccessible;
+                // Stop total size calculation.
                 $size_total = null;
             } elseif ( $dir_size === null ) {
-                // Timeout
-                $dir_size   = $timeout;
+                // Timeout.
+                $dir_size = $timeout;
+                // Stop total size calculation.
                 $size_total = null;
             } else {