From daf6a4617742e0c8f14d7bffd81f5edd3b29cca6 Mon Sep 17 00:00:00 2001
From: Ben Ramsey <ramsey@php.net>
Date: Tue, 12 Oct 2021 18:50:51 -0500
Subject: [PATCH 1/2] The PHP-8.1 branch is now for 8.1.0RC5

---
 NEWS               | 6 +++++-
 configure.ac       | 2 +-
 main/php_version.h | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 1dee714df5b..5349a3be6fa 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-?? ??? ????, PHP 8.1.0RC4
+?? ??? ????, PHP 8.1.0RC5
+
+
+
+14 Oct 2021, PHP 8.1.0RC4
 
 - CLI:
   . Fixed bug #81496 (Server logs incorrect request method). (lauri)
diff --git a/configure.ac b/configure.ac
index a98c9af4259..c3390ce73a0 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.0RC4-dev],[https://bugs.php.net],[php],[https://www.php.net])
+AC_INIT([PHP],[8.1.0RC5-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 ef180c3d8ab..35ab3d4fd5b 100644
--- a/main/php_version.h
+++ b/main/php_version.h
@@ -3,6 +3,6 @@
 #define PHP_MAJOR_VERSION 8
 #define PHP_MINOR_VERSION 1
 #define PHP_RELEASE_VERSION 0
-#define PHP_EXTRA_VERSION "RC4-dev"
-#define PHP_VERSION "8.1.0RC4-dev"
+#define PHP_EXTRA_VERSION "RC5-dev"
+#define PHP_VERSION "8.1.0RC5-dev"
 #define PHP_VERSION_ID 80100

From 6d0d5227d81a12b786f2b389ef6408b9798777a4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@php.net>
Date: Wed, 13 Oct 2021 11:53:02 +0200
Subject: [PATCH 2/2] bump zip ext version

---
 ext/zip/php_zip.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/zip/php_zip.h b/ext/zip/php_zip.h
index fe23c15df41..108d9d552c1 100644
--- a/ext/zip/php_zip.h
+++ b/ext/zip/php_zip.h
@@ -31,7 +31,7 @@ extern zend_module_entry zip_module_entry;
 #define ZIP_OVERWRITE ZIP_TRUNCATE
 #endif
 
-#define PHP_ZIP_VERSION "1.19.4"
+#define PHP_ZIP_VERSION "1.19.5"
 
 #define ZIP_OPENBASEDIR_CHECKPATH(filename) php_check_open_basedir(filename)