From 52def9e3f3ce94fb33f2561b6a978b58a1a456e7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 19 Feb 2020 11:20:56 +0100
Subject: better workaround to https://bugs.php.net/78465

---
 gmagick-bug78465.patch | 38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

(limited to 'gmagick-bug78465.patch')

diff --git a/gmagick-bug78465.patch b/gmagick-bug78465.patch
index c61f9b9..41c27a2 100644
--- a/gmagick-bug78465.patch
+++ b/gmagick-bug78465.patch
@@ -1,15 +1,29 @@
 Workaround to https://bugs.php.net/78465
 
-diff --git a/gmagick.c b/gmagick.c
-index 27ec8cc..2df8f5e 100644
---- a/gmagick.c
-+++ b/gmagick.c
-@@ -1722,6 +1722,8 @@ PHP_MINIT_FUNCTION(gmagick)
- PHP_MSHUTDOWN_FUNCTION(gmagick)
- {
- 	DestroyMagick();
-+	usleep(4242);
-+
- 	return SUCCESS;
+
+diff -up ./gmagick.c.old ./gmagick.c
+--- ./gmagick.c.old	2020-02-19 11:10:43.388127352 +0100
++++ ./gmagick.c	2020-02-19 11:10:48.691101111 +0100
+@@ -1742,6 +1742,13 @@ PHP_MINFO_FUNCTION(gmagick)
+ 	php_info_print_table_end();
  }
- /* }}} */
+ 
++/* {{{ PHP_MINFO_FUNCTION(gmagick)
++*/
++PHP_RINIT_FUNCTION(gmagick)
++{
++	MagickSetResourceLimit(ThreadsResource, 1);
++}
++
+ /* {{{ zend_module_entry gmagick_module_entry
+ */
+ zend_module_entry gmagick_module_entry =
+@@ -1751,7 +1758,7 @@ zend_module_entry gmagick_module_entry =
+ 	php_gmagick_functions,		/* Functions */
+ 	PHP_MINIT(gmagick),		/* MINIT */
+ 	PHP_MSHUTDOWN(gmagick),		/* MSHUTDOWN */
+-	NULL,				/* RINIT */
++	PHP_RINIT(gmagick),				/* RINIT */
+ 	NULL,				/* RSHUTDOWN */
+ 	PHP_MINFO(gmagick),		/* MINFO */
+ 	PHP_GMAGICK_VERSION,		/* Version */
-- 
cgit