Changeset 55403 for branches/6.1

Timestamp:

02/22/2023 02:19:26 PM (20 months ago)

Author:

SergeyBiryukov

Message:

Media: Revert [55348] from the 6.1 branch.

This will be committed to trunk instead.

See #52569.

Location:

branches/6.1/src

Files:

• wp-admin/includes/class-wp-debug-data.php (modified) (2 diffs)
• wp-includes/class-wp-image-editor-imagick.php (modified) (3 diffs)

branches/6.1/src/wp-admin/includes/class-wp-debug-data.php

@@ -581 +581 @@
                 'memory' => ( defined( 'imagick::RESOURCETYPE_MEMORY' ) ? size_format( $imagick->getResourceLimit( imagick::RESOURCETYPE_MEMORY ) ) : $not_available ),
                 'thread' => ( defined( 'imagick::RESOURCETYPE_THREAD' ) ? $imagick->getResourceLimit( imagick::RESOURCETYPE_THREAD ) : $not_available ),
-                'time'   => ( defined( 'imagick::RESOURCETYPE_TIME' ) ? $imagick->getResourceLimit( imagick::RESOURCETYPE_TIME ) : $not_available ),
             );
 
@@ -591 +590 @@
                 'imagick::RESOURCETYPE_MEMORY' => ( defined( 'imagick::RESOURCETYPE_MEMORY' ) ? size_format( $imagick->getResourceLimit( imagick::RESOURCETYPE_MEMORY ) ) : 'not available' ),
                 'imagick::RESOURCETYPE_THREAD' => ( defined( 'imagick::RESOURCETYPE_THREAD' ) ? $imagick->getResourceLimit( imagick::RESOURCETYPE_THREAD ) : 'not available' ),
-                'imagick::RESOURCETYPE_TIME'   => ( defined( 'imagick::RESOURCETYPE_TIME' ) ? $imagick->getResourceLimit( imagick::RESOURCETYPE_TIME ) : 'not available' ),
             );
 

branches/6.1/src/wp-includes/class-wp-image-editor-imagick.php

@@ -255 +255 @@
 
     /**
-     * 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;
-        }
-    }
-
-    /**
      * Resizes current image.
      *
@@ -321 +279 @@
 
         list( $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ) = $dims;
-
-        self::setImagickTimeLimit();
 
         if ( $crop ) {
@@ -590 +546 @@
         }
 
-        self::setImagickTimeLimit();
-
         try {
             $this->image->cropImage( $src_w, $src_h, $src_x, $src_y );