vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-10-06 23:58:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Fixes #46645.

git-svn-id: https://develop.svn.wordpress.org/trunk@45111 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2019-04-04 21:53:45 +00:00
parent af60a3c2bf
commit 9945849317
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-admin/includes/class-wp-debug-data.php
+13 -7
View File
@@ -317,18 +317,22 @@ class WP_Debug_Data {
* from causing a timeout. The default value is 30 seconds, and some
* 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;
}
// Here 20 seconds is a "sensible default" for how long to make the user wait for the directory size calculation.
// When testing 20 seconds seem enough in nearly all cases. The remaining edge cases are likely testing or development sites
// that have very large number of files, for example `node_modules` in plugins or themes, etc.
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.
$max_execution_time -= 1;
@@ -367,12 +371,14 @@ class WP_Debug_Data {
}
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 {
$is_subdir = ( strpos( $size_directories[ $size ]['path'], ABSPATH ) === 0 );