<!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>[55403] branches/6.1/src: Media: Revert [55348] from the 6.1 branch.</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/55403">55403</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/55403","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-02-22 14:19:26 +0000 (Wed, 22 Feb 2023)</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'>Media: Revert <a href="https://core.trac.wordpress.org/changeset/55348">[55348]</a> from the 6.1 branch.
This will be committed to trunk instead.
See <a href="https://core.trac.wordpress.org/ticket/52569">#52569</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches61srcwpadminincludesclasswpdebugdataphp">branches/6.1/src/wp-admin/includes/class-wp-debug-data.php</a></li>
<li><a href="#branches61srcwpincludesclasswpimageeditorimagickphp">branches/6.1/src/wp-includes/class-wp-image-editor-imagick.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches61srcwpadminincludesclasswpdebugdataphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/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">--- branches/6.1/src/wp-admin/includes/class-wp-debug-data.php 2023-02-22 06:22:02 UTC (rev 55402)
+++ branches/6.1/src/wp-admin/includes/class-wp-debug-data.php 2023-02-22 14:19:26 UTC (rev 55403)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,7 +580,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'map' => ( defined( 'imagick::RESOURCETYPE_MAP' ) ? size_format( $imagick->getResourceLimit( imagick::RESOURCETYPE_MAP ) ) : $not_available ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'memory' => ( defined( 'imagick::RESOURCETYPE_MEMORY' ) ? size_format( $imagick->getResourceLimit( imagick::RESOURCETYPE_MEMORY ) ) : $not_available ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'thread' => ( defined( 'imagick::RESOURCETYPE_THREAD' ) ? $imagick->getResourceLimit( imagick::RESOURCETYPE_THREAD ) : $not_available ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'time' => ( defined( 'imagick::RESOURCETYPE_TIME' ) ? $imagick->getResourceLimit( imagick::RESOURCETYPE_TIME ) : $not_available ),
</del><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"> $limits_debug = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,7 +589,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'imagick::RESOURCETYPE_MAP' => ( defined( 'imagick::RESOURCETYPE_MAP' ) ? size_format( $imagick->getResourceLimit( imagick::RESOURCETYPE_MAP ) ) : 'not available' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'imagick::RESOURCETYPE_MEMORY' => ( defined( 'imagick::RESOURCETYPE_MEMORY' ) ? size_format( $imagick->getResourceLimit( imagick::RESOURCETYPE_MEMORY ) ) : 'not available' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'imagick::RESOURCETYPE_THREAD' => ( defined( 'imagick::RESOURCETYPE_THREAD' ) ? $imagick->getResourceLimit( imagick::RESOURCETYPE_THREAD ) : 'not available' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'imagick::RESOURCETYPE_TIME' => ( defined( 'imagick::RESOURCETYPE_TIME' ) ? $imagick->getResourceLimit( imagick::RESOURCETYPE_TIME ) : 'not available' ),
</del><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"> $info['wp-media']['fields']['imagick_limits'] = array(
</span></span></pre></div>
<a id="branches61srcwpincludesclasswpimageeditorimagickphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.1/src/wp-includes/class-wp-image-editor-imagick.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.1/src/wp-includes/class-wp-image-editor-imagick.php 2023-02-22 06:22:02 UTC (rev 55402)
+++ branches/6.1/src/wp-includes/class-wp-image-editor-imagick.php 2023-02-22 14:19:26 UTC (rev 55403)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,48 +254,6 @@
</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">- * Depending on configuration, Imagick processing may take time.
- *
- * Multiple problems exist if PHP timeouts before ImageMagick completed:
- * 1. Temporary files aren't cleaned by ImageMagick garbage collection.
- * 2. No clear error is provided.
- * 3. The cause of such timeout can be hard to pinpoint.
- *
- * This function, which is expected to be run before heavy image routines, resolves
- * point 1 above by aligning Imagick's timeout with PHP's timeout, assuming it's set.
- *
- * Note: Imagick resource exhaustion does not issue catchable exceptions (yet)
- * See https://github.com/Imagick/imagick/issues/333
- * Note: The resource limit isn't saved/restored. It applies to
- * subsequent image operations within the time of the HTTP request.
- *
- * @since 6.2.0
- *
- * @return int|null Whether the new limit or null if none was set
- */
- public static function setImagickTimeLimit() {
- if ( ! defined( 'Imagick::RESOURCETYPE_TIME' ) ) {
- return null;
- }
-
- // Returns PHP_FLOAT_MAX if unset.
- $imagick_timeout = Imagick::getResourceLimit( Imagick::RESOURCETYPE_TIME );
-
- // Convert to an integer, keeping in mind that: 0 === (int) PHP_FLOAT_MAX.
- $imagick_timeout = $imagick_timeout > PHP_INT_MAX ? PHP_INT_MAX : (int) $imagick_timeout;
-
- $php_timeout = intval( ini_get( 'max_execution_time' ) );
-
- if ( $php_timeout > 1 && $php_timeout < $imagick_timeout ) {
- // $limit = $php_timeout - 1;
- $limit = floatval( 0.8 * $php_timeout );
- Imagick::setResourceLimit( Imagick::RESOURCETYPE_TIME, $limit );
-
- return $limit;
- }
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Resizes current image.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * At minimum, either a height or width must be provided.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,8 +279,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> list( $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ) = $dims;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- self::setImagickTimeLimit();
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $crop ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -589,8 +545,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $src_h -= $src_y;
</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">- self::setImagickTimeLimit();
-
</del><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->image->cropImage( $src_w, $src_h, $src_x, $src_y );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->image->setImagePage( $src_w, $src_h, 0, 0 );
</span></span></pre>
</div>
</div>
</body>
</html>