From 1c79973b425e1c44a99a009e6a32f248261b685c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 23 Oct 2020 11:52:25 +0200
Subject: backport fix for https://bugs.php.net/74083 from 7.4   master PHP-fpm
 is stopped on multiple reloads

---
 php.spec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index cff8211..521047f 100644
--- a/php.spec
+++ b/php.spec
@@ -141,7 +141,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name:    %{?scl_prefix}php
 Version: %{upver}%{?rcver:~%{rcver}}
-Release: 1%{?dist}
+Release: 2%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -195,6 +195,9 @@ Patch46: php-7.3.20-fixheader.patch
 Patch47: php-7.3.20-phpinfo.patch
 # backport PDOStatement::getColumnMeta from 7.4
 Patch48: php-7.3.3-pdooci.patch
+# backport FPM signals changes from 7.4
+# https://bugs.php.net/74083 master PHP-fpm is stopped on multiple reloads
+Patch49: php-7.3.24-fpm.patch
 
 # RC Patch
 Patch91: php-7.2.0-oci8conf.patch
@@ -962,6 +965,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
 %patch46 -p1 -b .fixheader
 %patch47 -p1 -b .phpinfo
 %patch48 -p1 -b .pdooci
+%patch49 -p1 -b .fpmsig
 
 %patch91 -p1 -b .remi-oci8
 
@@ -1919,6 +1923,10 @@ fi
 
 
 %changelog
+* Fri Oct 23 2020 Remi Collet <remi@remirepo.net> - 7.3.24~RC1-2
+- backport fix for https://bugs.php.net/74083 from 7.4
+  master PHP-fpm is stopped on multiple reloads
+
 * Tue Oct 13 2020 Remi Collet <remi@remirepo.net> - 7.3.24~RC1-1
 - update to 7.3.24RC1
 
-- 
cgit