Changeset 45111

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.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-debug-data.php (modified) (3 diffs)
• wp-includes/functions.php (modified) (4 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 {

trunk/src/wp-includes/functions.php

@@ -7015 +7015 @@
  *
  * @since MU (3.0.0)
+ * @since 5.2.0 $max_execution_time parameter added.
  *
  * @param string $directory Full path of a directory.
@@ -7052 +7053 @@
  * @since MU (3.0.0)
  * @since 4.3.0 $exclude parameter added.
+ * @since 5.2.0 $max_execution_time parameter added.
  *
  * @param string $directory Full path of a directory.
@@ -7068 +7070 @@
     }
 
-    if ( ! $max_execution_time ) {
-        // Keep the previous behavior but attempt to prevent fatal errors from timeout.
+    if ( $max_execution_time === null ) {
+        // Keep the previous behavior but attempt to prevent fatal errors from timeout if possible.
         if ( function_exists( 'ini_get' ) ) {
             $max_execution_time = ini_get( 'max_execution_time' );
         } else {
-            // Use PHP default.
-            $max_execution_time = 30;
+            // Disable...
+            $max_execution_time = 0;
         }
 
@@ -7096 +7098 @@
                 }
 
-                if ( microtime( true ) - WP_START_TIMESTAMP > $max_execution_time ) {
+                if ( $max_execution_time > 0 && microtime( true ) - WP_START_TIMESTAMP > $max_execution_time ) {
                     // Time exceeded. Give up instead of risking a fatal timeout.
                     $size = null;