From 562f84b239bcc69367b43c9ac9c1d7767bc92fa3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Jun 2021 09:20:41 +0200 Subject: update to 3.5.0RC1 drop all patches, all merged upstream add patch to fix some methods reflection from https://github.com/Imagick/imagick/pull/421 --- 347.patch | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 347.patch (limited to '347.patch') diff --git a/347.patch b/347.patch deleted file mode 100644 index b090b1e..0000000 --- a/347.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 960409cb784cd5d8c9f41068a54dad8141fdf25d Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 4 Sep 2020 08:57:24 +0200 -Subject: [PATCH] thread limit per request - ---- - imagick.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/imagick.c b/imagick.c -index 1e6d174..8d0a7b5 100644 ---- a/imagick.c -+++ b/imagick.c -@@ -3872,10 +3872,6 @@ PHP_MINIT_FUNCTION(imagick) - checkImagickVersion(); - } - -- if (IMAGICK_G(set_single_thread)) { -- MagickSetResourceLimit(ThreadResource, 1); -- } -- - return SUCCESS; - } - -@@ -3981,6 +3977,11 @@ PHP_RINIT_FUNCTION(imagick) - (void)module_number; - - IMAGICK_G(progress_callback) = NULL; -+ -+ if (IMAGICK_G(set_single_thread)) { -+ MagickSetResourceLimit(ThreadResource, 1); -+ } -+ - return SUCCESS; - } - -- cgit