diff options
| author | Remi Collet <remi@remirepo.net> | 2020-09-04 11:25:42 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2020-09-04 11:25:42 +0200 |
| commit | 94abfd85fee63633104a6b4410a050ff7637b53a (patch) | |
| tree | 2dff96d917d381baf78bcd1763b15d1fd862967b /347.patch | |
| parent | 9ad7f9cc2df761bd2976880f81aad344849e5aa5 (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 '347.patch')
| -rw-r--r-- | 347.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/347.patch b/347.patch new file mode 100644 index 0000000..b090b1e --- /dev/null +++ b/347.patch @@ -0,0 +1,36 @@ +From 960409cb784cd5d8c9f41068a54dad8141fdf25d Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +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; + } + |