Rel 6; Don't get stuck if no permission to kill process.

diff --git a/opcache-nokill-perm.patch b/opcache-nokill-perm.patch
new file mode 100644 (file)
index 0000000..a064b79
--- /dev/null
+++ b/opcache-nokill-perm.patch
@@ -0,0 +1,15 @@
+--- php-7.4.33/ext/opcache/ZendAccelerator.c~  2022-10-31 11:36:06.000000000 +0100
++++ php-7.4.33/ext/opcache/ZendAccelerator.c   2024-03-20 11:15:28.896613056 +0100
+@@ -797,7 +797,11 @@ static inline void kill_all_lockers(stru
+                                       /* successfully killed locker, process no longer exists  */
+                                       success = 1;
+                                       zend_accel_error(ACCEL_LOG_WARNING, "Killed locker %d", mem_usage_check->l_pid);
+-                              }
++                                } else if (errno == EPERM) {
++                                        /* we have no permission to kill the other process, so no point in trying */
++                                        success = 1;
++                                        zend_accel_error(ACCEL_LOG_WARNING, "No permission to kill Process %d", mem_usage_check->l_pid);
++                                }
+                               break;
+                       }
+                       usleep(10000);

diff --git a/php.spec b/php.spec
index 7bf154cfc3e71c80cba5160fee27ebc620d3b294..41643d077e7ae39e646ed0e7fec3cba878809bd6 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -150,7 +150,7 @@ Summary(ru.UTF-8):  PHP Версии 7 - язык препроцессирова
 Summary(uk.UTF-8):     PHP Версії 7 - мова препроцесування HTML-файлів, виконувана на сервері
 Name:          %{orgname}%{php_suffix}
 Version:       7.4.33
-Release:       5
+Release:       6
 Epoch:         4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -175,6 +175,7 @@ Patch1:             %{orgname}-pldlogo.patch
 Patch2:                %{orgname}-mail.patch
 Patch3:                %{orgname}-link-libs.patch
 Patch4:                intl-stdc++.patch
+Patch5:                opcache-nokill-perm.patch
 Patch7:                %{orgname}-sapi-ini-file.patch
 Patch9:                libtool-tag.patch
 Patch10:       %{orgname}-ini.patch
@@ -1891,7 +1892,7 @@ cp -p php.ini-production php.ini
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-
+%patch5 -p1
 %patch7 -p1
 %patch9 -p1
 %patch10 -p1