From fb819faa4e92473973ee8f1689538512977b171b Mon Sep 17 00:00:00 2001
From: Ben Ramsey <ramsey@php.net>
Date: Tue, 26 Apr 2022 19:22:15 -0500
Subject: [PATCH 1/2] Prepare for PHP 8.1.7

---
 NEWS               | 5 ++++-
 Zend/zend.h        | 2 +-
 configure.ac       | 2 +-
 main/php_version.h | 6 +++---
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index ea99ae16d0d..970a642f043 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,9 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.1.6
+?? ??? ????, PHP 8.1.7
+
+
+12 May 2022, PHP 8.1.6
 
 - Core:
   . Fixed bug GH-8310 (Registry settings are no longer recognized). (cmb)
diff --git a/Zend/zend.h b/Zend/zend.h
index 568f42de2a8..c88d53ee27a 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -20,7 +20,7 @@
 #ifndef ZEND_H
 #define ZEND_H
 
-#define ZEND_VERSION "4.1.6-dev"
+#define ZEND_VERSION "4.1.7-dev"
 
 #define ZEND_ENGINE_3
 
diff --git a/configure.ac b/configure.ac
index 8e5f67e2325..b4fa28f2881 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ dnl Basic autoconf initialization, generation of config.nice.
 dnl ----------------------------------------------------------------------------
 
 AC_PREREQ([2.68])
-AC_INIT([PHP],[8.1.6-dev],[https://bugs.php.net],[php],[https://www.php.net])
+AC_INIT([PHP],[8.1.7-dev],[https://bugs.php.net],[php],[https://www.php.net])
 AC_CONFIG_SRCDIR([main/php_version.h])
 AC_CONFIG_AUX_DIR([build])
 AC_PRESERVE_HELP_ORDER
diff --git a/main/php_version.h b/main/php_version.h
index 7c867548553..f027619e22e 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -2,7 +2,7 @@
 /* edit configure.ac to change version number */
 #define PHP_MAJOR_VERSION 8
 #define PHP_MINOR_VERSION 1
-#define PHP_RELEASE_VERSION 6
+#define PHP_RELEASE_VERSION 7
 #define PHP_EXTRA_VERSION "-dev"
-#define PHP_VERSION "8.1.6-dev"
-#define PHP_VERSION_ID 80106
+#define PHP_VERSION "8.1.7-dev"
+#define PHP_VERSION_ID 80107

From 0df28869f69b88b23f6f9c36e71906c469c8fb5b Mon Sep 17 00:00:00 2001
From: Jakub Zelenka <bukka@php.net>
Date: Wed, 27 Apr 2022 19:11:47 +0100
Subject: [PATCH 2/2] Add skip for FPM resource heavy tests

---
 sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt | 1 +
 sapi/fpm/tests/proc-idle-timeout.phpt                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt b/sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt
index 6fc08493435..cb33a2f6635 100644
--- a/sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt
+++ b/sapi/fpm/tests/bug77023-pm-dynamic-blocking-sigquit.phpt
@@ -6,6 +6,7 @@ pcntl
 <?php
 include "skipif.inc";
 if (!function_exists('pcntl_sigprocmask')) die('skip Requires pcntl_sigprocmask()');
+if (!getenv("FPM_RUN_RESOURCE_HEAVY_TESTS")) die("skip resource heavy test");
 if (getenv('SKIP_SLOW_TESTS')) die('skip slow tests excluded by request');
 ?>
 --FILE--
diff --git a/sapi/fpm/tests/proc-idle-timeout.phpt b/sapi/fpm/tests/proc-idle-timeout.phpt
index 2c49a19b1de..0c1d10cab87 100644
--- a/sapi/fpm/tests/proc-idle-timeout.phpt
+++ b/sapi/fpm/tests/proc-idle-timeout.phpt
@@ -3,8 +3,8 @@ FPM: Process manager config pm.process_idle_timeout
 --SKIPIF--
 <?php
 include "skipif.inc";
+if (!getenv("FPM_RUN_RESOURCE_HEAVY_TESTS")) die("skip resource heavy test");
 if (getenv("SKIP_SLOW_TESTS")) die("skip slow test");
-if (!getenv("FPM_LOCAL_TESTS")) die("skip local test")
 ?>
 --FILE--
 <?php