[packages/php/PHP_5_3] fixup! Re-diff against 5.3.29 tree

[glen]

commit 767253266a369f62e5a932c73dfccdc902b4ea1f
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Fri Oct 29 12:16:00 2021 +0300

    fixup! Re-diff against 5.3.29 tree

 bug-81026-CVE-2021-21703.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/bug-81026-CVE-2021-21703.patch b/bug-81026-CVE-2021-21703.patch
index 02fe815..805b923 100644
--- a/bug-81026-CVE-2021-21703.patch
+++ b/bug-81026-CVE-2021-21703.patch
@@ -8,6 +8,7 @@ The main change is to store scoreboard procs directly to the variable sized
 array rather than indirectly through the pointer.
 
 Signed-off-by: Stanislav Malyshev <stas at php.net>
+Signed-off-by: Elan Ruusamäe <glen at pld-linux.org>
 (cherry picked from commit cb2021e5f69da5e2868130a05bb53db0f9f89e4b)
 (cherry picked from commit 4699cc1b1b957c843c71a79fa816446b622d4278)
 ---
@@ -329,20 +330,19 @@ index e1e69c9780c..fcf9f169705 100644
  	} else {
  		scoreboard->free_proc = i + 1;
 diff --git a/sapi/fpm/fpm/fpm_scoreboard.h b/sapi/fpm/fpm/fpm_scoreboard.h
-index f58a28737df..a0cc093b8c4 100644
---- a/sapi/fpm/fpm/fpm_scoreboard.h
-+++ b/sapi/fpm/fpm/fpm_scoreboard.h
-@@ -65,7 +65,7 @@ struct fpm_scoreboard_s {
+--- php-5.3.29/sapi/fpm/fpm/fpm_scoreboard.h~	2014-08-13 22:22:50.000000000 +0300
++++ php-5.3.29/sapi/fpm/fpm/fpm_scoreboard.h	2021-10-29 12:14:24.494538615 +0300
+@@ -64,7 +64,7 @@
+ 	unsigned int lq_len;
  	unsigned int nprocs;
  	int free_proc;
- 	unsigned long int slow_rq;
 -	struct fpm_scoreboard_proc_s *procs[];
 +	struct fpm_scoreboard_proc_s procs[];
  };
  
  int fpm_scoreboard_init_main();
-@@ -74,18 +74,19 @@ int fpm_scoreboard_init_child(struct fpm_worker_pool_s *wp);
- void fpm_scoreboard_update(int idle, int active, int lq, int lq_len, int requests, int max_children_reached, int slow_rq, int action, struct fpm_scoreboard_s *scoreboard);
+@@ -73,18 +73,19 @@
+ void fpm_scoreboard_update(int idle, int active, int lq, int lq_len, int requests, int max_children_reached, int action, struct fpm_scoreboard_s *scoreboard);
  struct fpm_scoreboard_s *fpm_scoreboard_get();
  struct fpm_scoreboard_proc_s *fpm_scoreboard_proc_get(struct fpm_scoreboard_s *scoreboard, int child_index);
 +struct fpm_scoreboard_proc_s *fpm_scoreboard_proc_get_from_child(struct fpm_child_s *child);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/8359939cab722919c56e747283a64e725a78dcee