summaryrefslogtreecommitdiffstats
path: root/296.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-09-04 11:25:42 +0200
committerRemi Collet <remi@remirepo.net>2020-09-04 11:25:42 +0200
commit94abfd85fee63633104a6b4410a050ff7637b53a (patch)
tree2dff96d917d381baf78bcd1763b15d1fd862967b /296.patch
parent9ad7f9cc2df761bd2976880f81aad344849e5aa5 (diff)
add patches for PHP 8 from upstream and
https://github.com/Imagick/imagick/pull/346 SPL always there https://github.com/Imagick/imagick/pull/347 thread limit per request https://github.com/Imagick/imagick/pull/348 single thread
Diffstat (limited to '296.patch')
-rw-r--r--296.patch22
1 files changed, 0 insertions, 22 deletions
diff --git a/296.patch b/296.patch
deleted file mode 100644
index 7eb5097..0000000
--- a/296.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 421c3705107fab022631b93a2e70fc7c0ffc86ea Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Tue, 23 Jul 2019 18:02:31 +0200
-Subject: [PATCH] Fix #295 ensure IM don't use multiple threads
-
----
- imagick.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/imagick.c b/imagick.c
-index 8e58afe..e5a688a 100644
---- a/imagick.c
-+++ b/imagick.c
-@@ -3844,6 +3844,8 @@ PHP_RINIT_FUNCTION(imagick)
- (void)module_number;
-
- IMAGICK_G(progress_callback) = NULL;
-+ MagickSetResourceLimit(ThreadResource, 1);
-+
- return SUCCESS;
- }
-