<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[45111] trunk/src: Site health: fix usage of max_execution_time.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/45111">45111</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/45111","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-04-04 21:53:45 +0000 (Thu, 04 Apr 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Site health: fix usage of max_execution_time. When PHP is run from the cli the default is 0.
Fixes <a href="https://core.trac.wordpress.org/ticket/46645">#46645</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesclasswpdebugdataphp">trunk/src/wp-admin/includes/class-wp-debug-data.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesclasswpdebugdataphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-debug-data.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-debug-data.php 2019-04-04 21:23:29 UTC (rev 45110)
+++ trunk/src/wp-admin/includes/class-wp-debug-data.php 2019-04-04 21:53:45 UTC (rev 45111)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,18 +317,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * from causing a timeout. The default value is 30 seconds, and some
</span><span class="cx" style="display: block; padding: 0 10px"> * hosts do not allow you to read configuration values.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $max_execution_time = 30;
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'ini_get' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $max_execution_time = ini_get( 'max_execution_time' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Here 20 seconds is a "sensible default" for how long to make the user wait for the directory size calculation.
</span><span class="cx" style="display: block; padding: 0 10px"> // When testing 20 seconds seem enough in nearly all cases. The remaining edge cases are likely testing or development sites
</span><span class="cx" style="display: block; padding: 0 10px"> // that have very large number of files, for example `node_modules` in plugins or themes, etc.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $max_execution_time > 20 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $max_execution_time = 20;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $max_execution_time > 2 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $max_execution_time > 10 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the max_execution_time is set to lower than 20 seconds, reduce it a bit to prevent
</span><span class="cx" style="display: block; padding: 0 10px"> // edge-case timeouts that may happen after the size loop has finished running.
</span><span class="cx" style="display: block; padding: 0 10px"> $max_execution_time -= 1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,12 +371,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $dir_size === false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Error reading
- $dir_size = $inaccessible;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Error reading.
+ $dir_size = $inaccessible;
+ // Stop total size calculation.
</ins><span class="cx" style="display: block; padding: 0 10px"> $size_total = null;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $dir_size === null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Timeout
- $dir_size = $timeout;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Timeout.
+ $dir_size = $timeout;
+ // Stop total size calculation.
</ins><span class="cx" style="display: block; padding: 0 10px"> $size_total = null;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $is_subdir = ( strpos( $size_directories[ $size ]['path'], ABSPATH ) === 0 );
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2019-04-04 21:23:29 UTC (rev 45110)
+++ trunk/src/wp-includes/functions.php 2019-04-04 21:53:45 UTC (rev 45111)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7014,6 +7014,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * a blog has exceeded its allowed upload space.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since MU (3.0.0)
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.2.0 $max_execution_time parameter added.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $directory Full path of a directory.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $max_execution_time Maximum time to run before giving up. In seconds.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7051,6 +7052,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since MU (3.0.0)
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.3.0 $exclude parameter added.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.2.0 $max_execution_time parameter added.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $directory Full path of a directory.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $exclude Optional. Full path of a subdirectory to exclude from the total.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7067,13 +7069,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $max_execution_time ) {
- // Keep the previous behavior but attempt to prevent fatal errors from timeout.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $max_execution_time === null ) {
+ // Keep the previous behavior but attempt to prevent fatal errors from timeout if possible.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'ini_get' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $max_execution_time = ini_get( 'max_execution_time' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Use PHP default.
- $max_execution_time = 30;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Disable...
+ $max_execution_time = 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Leave 1 second "buffer" for other operations if $max_execution_time has reasonable value.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7095,7 +7097,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( microtime( true ) - WP_START_TIMESTAMP > $max_execution_time ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $max_execution_time > 0 && microtime( true ) - WP_START_TIMESTAMP > $max_execution_time ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Time exceeded. Give up instead of risking a fatal timeout.
</span><span class="cx" style="display: block; padding: 0 10px"> $size = null;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span></span></pre>
</div>
</div>
</body>
</html>