commit 52efa22d2e3ed213c5932bc8709c154b50596192
Author: Elan Ruusamäe <[email protected]>
Date: Fri Oct 29 12:11:50 2021 +0300
Re-diff against 5.3.29 tree
bug-81026-CVE-2021-21703.patch | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/bug-81026-CVE-2021-21703.patch b/bug-81026-CVE-2021-21703.patch
index a0e4cd8..02fe815 100644
--- a/bug-81026-CVE-2021-21703.patch
+++ b/bug-81026-CVE-2021-21703.patch
@@ -19,10 +19,9 @@ Signed-off-by: Stanislav Malyshev <[email protected]>
sapi/fpm/fpm/fpm_worker_pool.c | 2 +-
6 files changed, 81 insertions(+), 61 deletions(-)
-diff --git a/sapi/fpm/fpm/fpm_children.c b/sapi/fpm/fpm/fpm_children.c
-index 45cc075b42a..74c2f382366 100644
---- a/sapi/fpm/fpm/fpm_children.c
-+++ b/sapi/fpm/fpm/fpm_children.c
+diff --git a/sapi/fpm/fpm/fpm_request.c b/sapi/fpm/fpm/fpm_request.c
+--- php-5.3.29/sapi/fpm/fpm/fpm_children.c~ 2021-10-29 12:04:41.000000000
+0300
++++ php-5.3.29/sapi/fpm/fpm/fpm_children.c 2021-10-29 12:09:33.179137332
+0300
@@ -239,7 +239,7 @@ void fpm_children_bury() /* {{{ */
fpm_child_unlink(child);
@@ -32,14 +31,14 @@ index 45cc075b42a..74c2f382366 100644
fpm_clock_get(&tv1);
-@@ -249,9 +249,9 @@ void fpm_children_bury() /* {{{ */
+@@ -249,9 +249,9 @@
if (!fpm_pctl_can_spawn_children()) {
severity = ZLOG_DEBUG;
}
- zlog(severity, "[pool %s] child %d exited %s
after %ld.%06d seconds from start", child->wp->config->name, (int) pid, buf,
tv2.tv_sec, (int) tv2.tv_usec);
+ zlog(severity, "[pool %s] child %d exited %s
after %ld.%06d seconds from start", wp->config->name, (int) pid, buf,
tv2.tv_sec, (int) tv2.tv_usec);
} else {
-- zlog(ZLOG_DEBUG, "[pool %s] child %d has been
killed by the process management after %ld.%06d seconds from start",
child->wp->config->name, (int) pid, tv2.tv_sec, (int) tv2.tv_usec);
+- zlog(ZLOG_DEBUG, "[pool %s] child %d has been
killed by the process managment after %ld.%06d seconds from start",
child->wp->config->name, (int) pid, tv2.tv_sec, (int) tv2.tv_usec);
+ zlog(ZLOG_DEBUG, "[pool %s] child %d has been
killed by the process management after %ld.%06d seconds from start",
wp->config->name, (int) pid, tv2.tv_sec, (int) tv2.tv_usec);
}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/8359939cab722919c56e747283a64e725a78dcee
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
